diff --git a/managed_vms/.gitignore b/appengine/flexible/.gitignore
similarity index 100%
rename from managed_vms/.gitignore
rename to appengine/flexible/.gitignore
diff --git a/managed_vms/README.md b/appengine/flexible/README.md
similarity index 86%
rename from managed_vms/README.md
rename to appengine/flexible/README.md
index e9f5947aba2..2fc79b0c8db 100644
--- a/managed_vms/README.md
+++ b/appengine/flexible/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs Python Samples
+## Google App Engine Flexible Environment Python Samples
 
-These are samples for using Python on Google App Engine Managed VMs. These samples are typically referenced from the [docs](https://cloud.google.com/appengine/docs).
+These are samples for using Python on Google App Engine Flexible Environment. These samples are typically referenced from the [docs](https://cloud.google.com/appengine/docs).
 
 See our other [Google Cloud Platform github repos](https://github.com/GoogleCloudPlatform) for sample applications and
 scaffolding for other frameworks and use cases.
@@ -23,7 +23,7 @@ In general, the samples typically require:
 
    ```
    git clone https://github.com/GoogleCloudPlatform/python-docs-samples.git
-   cd python-docs-samples/managed_vms
+   cd python-docs-samples/appengine/flexible
    ```
 
 4. Open a sample folder, create a virtualenv, install dependencies, and run the sample:
diff --git a/managed_vms/analytics/README.md b/appengine/flexible/analytics/README.md
similarity index 90%
rename from managed_vms/analytics/README.md
rename to appengine/flexible/analytics/README.md
index ee2d73b8449..60cfece907a 100644
--- a/managed_vms/analytics/README.md
+++ b/appengine/flexible/analytics/README.md
@@ -1,6 +1,6 @@
-# Google Analytics Measurement Protocol sample for Google App Engine Managed VMs
+# Google Analytics Measurement Protocol sample for Google App Engine Flexible
 
-This sample demonstrates how to use the [Google Analytics Measurement Protocol](https://developers.google.com/analytics/devguides/collection/protocol/v1/) (or any other SQL server) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use the [Google Analytics Measurement Protocol](https://developers.google.com/analytics/devguides/collection/protocol/v1/) (or any other SQL server) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/analytics/app.yaml b/appengine/flexible/analytics/app.yaml
similarity index 100%
rename from managed_vms/analytics/app.yaml
rename to appengine/flexible/analytics/app.yaml
diff --git a/managed_vms/analytics/main.py b/appengine/flexible/analytics/main.py
similarity index 100%
rename from managed_vms/analytics/main.py
rename to appengine/flexible/analytics/main.py
diff --git a/managed_vms/analytics/main_test.py b/appengine/flexible/analytics/main_test.py
similarity index 100%
rename from managed_vms/analytics/main_test.py
rename to appengine/flexible/analytics/main_test.py
diff --git a/managed_vms/analytics/requirements.txt b/appengine/flexible/analytics/requirements.txt
similarity index 100%
rename from managed_vms/analytics/requirements.txt
rename to appengine/flexible/analytics/requirements.txt
diff --git a/managed_vms/cloudsql/README.md b/appengine/flexible/cloudsql/README.md
similarity index 95%
rename from managed_vms/cloudsql/README.md
rename to appengine/flexible/cloudsql/README.md
index 2ddefe8634b..76ccabd80c4 100644
--- a/managed_vms/cloudsql/README.md
+++ b/appengine/flexible/cloudsql/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud SQL sample for Google App Engine Managed VMs
+# Python Google Cloud SQL sample for Google App Engine Flexible
 
-This sample demonstrates how to use [Google Cloud SQL](https://cloud.google.com/sql/) (or any other SQL server) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud SQL](https://cloud.google.com/sql/) (or any other SQL server) on [Google App Engine Flexible](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/cloudsql/app.yaml b/appengine/flexible/cloudsql/app.yaml
similarity index 100%
rename from managed_vms/cloudsql/app.yaml
rename to appengine/flexible/cloudsql/app.yaml
diff --git a/managed_vms/cloudsql/create_tables.py b/appengine/flexible/cloudsql/create_tables.py
similarity index 100%
rename from managed_vms/cloudsql/create_tables.py
rename to appengine/flexible/cloudsql/create_tables.py
diff --git a/managed_vms/cloudsql/main.py b/appengine/flexible/cloudsql/main.py
similarity index 100%
rename from managed_vms/cloudsql/main.py
rename to appengine/flexible/cloudsql/main.py
diff --git a/managed_vms/cloudsql/main_test.py b/appengine/flexible/cloudsql/main_test.py
similarity index 100%
rename from managed_vms/cloudsql/main_test.py
rename to appengine/flexible/cloudsql/main_test.py
diff --git a/managed_vms/cloudsql/requirements.txt b/appengine/flexible/cloudsql/requirements.txt
similarity index 100%
rename from managed_vms/cloudsql/requirements.txt
rename to appengine/flexible/cloudsql/requirements.txt
diff --git a/managed_vms/datastore/README.md b/appengine/flexible/datastore/README.md
similarity index 78%
rename from managed_vms/datastore/README.md
rename to appengine/flexible/datastore/README.md
index 7cedaff5c91..d5f61157907 100644
--- a/managed_vms/datastore/README.md
+++ b/appengine/flexible/datastore/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Datastore sample for Google App Engine Managed VMs
+# Python Google Cloud Datastore sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Google Cloud Datastore](https://cloud.google.com/datastore/) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud Datastore](https://cloud.google.com/datastore/) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/datastore/app.yaml b/appengine/flexible/datastore/app.yaml
similarity index 100%
rename from managed_vms/datastore/app.yaml
rename to appengine/flexible/datastore/app.yaml
diff --git a/managed_vms/datastore/main.py b/appengine/flexible/datastore/main.py
similarity index 100%
rename from managed_vms/datastore/main.py
rename to appengine/flexible/datastore/main.py
diff --git a/managed_vms/datastore/main_test.py b/appengine/flexible/datastore/main_test.py
similarity index 100%
rename from managed_vms/datastore/main_test.py
rename to appengine/flexible/datastore/main_test.py
diff --git a/managed_vms/datastore/requirements.txt b/appengine/flexible/datastore/requirements.txt
similarity index 100%
rename from managed_vms/datastore/requirements.txt
rename to appengine/flexible/datastore/requirements.txt
diff --git a/managed_vms/disk/app.yaml b/appengine/flexible/disk/app.yaml
similarity index 100%
rename from managed_vms/disk/app.yaml
rename to appengine/flexible/disk/app.yaml
diff --git a/managed_vms/disk/main.py b/appengine/flexible/disk/main.py
similarity index 100%
rename from managed_vms/disk/main.py
rename to appengine/flexible/disk/main.py
diff --git a/managed_vms/disk/main_test.py b/appengine/flexible/disk/main_test.py
similarity index 100%
rename from managed_vms/disk/main_test.py
rename to appengine/flexible/disk/main_test.py
diff --git a/managed_vms/disk/requirements.txt b/appengine/flexible/disk/requirements.txt
similarity index 100%
rename from managed_vms/disk/requirements.txt
rename to appengine/flexible/disk/requirements.txt
diff --git a/managed_vms/django_cloudsql/README.md b/appengine/flexible/django_cloudsql/README.md
similarity index 96%
rename from managed_vms/django_cloudsql/README.md
rename to appengine/flexible/django_cloudsql/README.md
index 22051223d1a..e529c04eb55 100644
--- a/managed_vms/django_cloudsql/README.md
+++ b/appengine/flexible/django_cloudsql/README.md
@@ -1,7 +1,7 @@
 # Getting started with Django on Google Cloud Platform
 
 This repository is an example of how to run a [Django](https://www.djangoproject.com/) 
-app on Google Managed VMs. It uses the [Writing your first Django app](https://docs.djangoproject.com/en/1.9/intro/tutorial01/) as the example app to deploy.
+app on Google App Engine Flexible Environment. It uses the [Writing your first Django app](https://docs.djangoproject.com/en/1.9/intro/tutorial01/) as the example app to deploy.
 
 
 ## Setup the database
diff --git a/managed_vms/django_cloudsql/app.yaml b/appengine/flexible/django_cloudsql/app.yaml
similarity index 100%
rename from managed_vms/django_cloudsql/app.yaml
rename to appengine/flexible/django_cloudsql/app.yaml
diff --git a/managed_vms/django_cloudsql/manage.py b/appengine/flexible/django_cloudsql/manage.py
similarity index 100%
rename from managed_vms/django_cloudsql/manage.py
rename to appengine/flexible/django_cloudsql/manage.py
diff --git a/appengine/__init__.py b/appengine/flexible/django_cloudsql/mysite/__init__.py
similarity index 100%
rename from appengine/__init__.py
rename to appengine/flexible/django_cloudsql/mysite/__init__.py
diff --git a/managed_vms/django_cloudsql/mysite/settings.py b/appengine/flexible/django_cloudsql/mysite/settings.py
similarity index 100%
rename from managed_vms/django_cloudsql/mysite/settings.py
rename to appengine/flexible/django_cloudsql/mysite/settings.py
diff --git a/managed_vms/django_cloudsql/mysite/urls.py b/appengine/flexible/django_cloudsql/mysite/urls.py
similarity index 100%
rename from managed_vms/django_cloudsql/mysite/urls.py
rename to appengine/flexible/django_cloudsql/mysite/urls.py
diff --git a/managed_vms/django_cloudsql/mysite/wsgi.py b/appengine/flexible/django_cloudsql/mysite/wsgi.py
similarity index 100%
rename from managed_vms/django_cloudsql/mysite/wsgi.py
rename to appengine/flexible/django_cloudsql/mysite/wsgi.py
diff --git a/managed_vms/django_cloudsql/mysite/__init__.py b/appengine/flexible/django_cloudsql/polls/__init__.py
similarity index 100%
rename from managed_vms/django_cloudsql/mysite/__init__.py
rename to appengine/flexible/django_cloudsql/polls/__init__.py
diff --git a/managed_vms/django_cloudsql/polls/admin.py b/appengine/flexible/django_cloudsql/polls/admin.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/admin.py
rename to appengine/flexible/django_cloudsql/polls/admin.py
diff --git a/managed_vms/django_cloudsql/polls/apps.py b/appengine/flexible/django_cloudsql/polls/apps.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/apps.py
rename to appengine/flexible/django_cloudsql/polls/apps.py
diff --git a/managed_vms/django_cloudsql/polls/models.py b/appengine/flexible/django_cloudsql/polls/models.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/models.py
rename to appengine/flexible/django_cloudsql/polls/models.py
diff --git a/managed_vms/django_cloudsql/polls/tests.py b/appengine/flexible/django_cloudsql/polls/tests.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/tests.py
rename to appengine/flexible/django_cloudsql/polls/tests.py
diff --git a/managed_vms/django_cloudsql/polls/urls.py b/appengine/flexible/django_cloudsql/polls/urls.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/urls.py
rename to appengine/flexible/django_cloudsql/polls/urls.py
diff --git a/managed_vms/django_cloudsql/polls/views.py b/appengine/flexible/django_cloudsql/polls/views.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/views.py
rename to appengine/flexible/django_cloudsql/polls/views.py
diff --git a/managed_vms/django_cloudsql/requirements.txt b/appengine/flexible/django_cloudsql/requirements.txt
similarity index 100%
rename from managed_vms/django_cloudsql/requirements.txt
rename to appengine/flexible/django_cloudsql/requirements.txt
diff --git a/managed_vms/endpoints/.gitignore b/appengine/flexible/endpoints/.gitignore
similarity index 100%
rename from managed_vms/endpoints/.gitignore
rename to appengine/flexible/endpoints/.gitignore
diff --git a/managed_vms/endpoints/Dockerfile.container-engine b/appengine/flexible/endpoints/Dockerfile.container-engine
similarity index 100%
rename from managed_vms/endpoints/Dockerfile.container-engine
rename to appengine/flexible/endpoints/Dockerfile.container-engine
diff --git a/managed_vms/endpoints/README.md b/appengine/flexible/endpoints/README.md
similarity index 97%
rename from managed_vms/endpoints/README.md
rename to appengine/flexible/endpoints/README.md
index 0aba62ba4d7..04401ade2b9 100644
--- a/managed_vms/endpoints/README.md
+++ b/appengine/flexible/endpoints/README.md
@@ -11,7 +11,7 @@ This sample consists of two parts:
 
 ### Running the backend
 
-For more info on running Flexible applications locally, see [the getting started documentation](https://cloud.google.com/appengine/docs/managed-vms/python/hello-world).
+For more info on running Flexible applications locally, see [the getting started documentation](https://cloud.google.com/python/getting-started/hello-world).
 
 Install all the dependencies:
 
diff --git a/managed_vms/endpoints/app.yaml b/appengine/flexible/endpoints/app.yaml
similarity index 100%
rename from managed_vms/endpoints/app.yaml
rename to appengine/flexible/endpoints/app.yaml
diff --git a/managed_vms/endpoints/clients/echo-client.py b/appengine/flexible/endpoints/clients/echo-client.py
similarity index 100%
rename from managed_vms/endpoints/clients/echo-client.py
rename to appengine/flexible/endpoints/clients/echo-client.py
diff --git a/managed_vms/endpoints/clients/google-id-token-client.py b/appengine/flexible/endpoints/clients/google-id-token-client.py
similarity index 100%
rename from managed_vms/endpoints/clients/google-id-token-client.py
rename to appengine/flexible/endpoints/clients/google-id-token-client.py
diff --git a/managed_vms/endpoints/clients/google-jwt-client.py b/appengine/flexible/endpoints/clients/google-jwt-client.py
similarity index 100%
rename from managed_vms/endpoints/clients/google-jwt-client.py
rename to appengine/flexible/endpoints/clients/google-jwt-client.py
diff --git a/managed_vms/endpoints/index.html b/appengine/flexible/endpoints/index.html
similarity index 100%
rename from managed_vms/endpoints/index.html
rename to appengine/flexible/endpoints/index.html
diff --git a/managed_vms/endpoints/main.py b/appengine/flexible/endpoints/main.py
similarity index 100%
rename from managed_vms/endpoints/main.py
rename to appengine/flexible/endpoints/main.py
diff --git a/managed_vms/endpoints/requirements.txt b/appengine/flexible/endpoints/requirements.txt
similarity index 100%
rename from managed_vms/endpoints/requirements.txt
rename to appengine/flexible/endpoints/requirements.txt
diff --git a/managed_vms/endpoints/swagger.yaml b/appengine/flexible/endpoints/swagger.yaml
similarity index 100%
rename from managed_vms/endpoints/swagger.yaml
rename to appengine/flexible/endpoints/swagger.yaml
diff --git a/managed_vms/extending_runtime/.dockerignore b/appengine/flexible/extending_runtime/.dockerignore
similarity index 100%
rename from managed_vms/extending_runtime/.dockerignore
rename to appengine/flexible/extending_runtime/.dockerignore
diff --git a/managed_vms/extending_runtime/Dockerfile b/appengine/flexible/extending_runtime/Dockerfile
similarity index 100%
rename from managed_vms/extending_runtime/Dockerfile
rename to appengine/flexible/extending_runtime/Dockerfile
diff --git a/managed_vms/extending_runtime/app.yaml b/appengine/flexible/extending_runtime/app.yaml
similarity index 100%
rename from managed_vms/extending_runtime/app.yaml
rename to appengine/flexible/extending_runtime/app.yaml
diff --git a/managed_vms/extending_runtime/main.py b/appengine/flexible/extending_runtime/main.py
similarity index 100%
rename from managed_vms/extending_runtime/main.py
rename to appengine/flexible/extending_runtime/main.py
diff --git a/managed_vms/extending_runtime/main_test.py b/appengine/flexible/extending_runtime/main_test.py
similarity index 100%
rename from managed_vms/extending_runtime/main_test.py
rename to appengine/flexible/extending_runtime/main_test.py
diff --git a/managed_vms/extending_runtime/requirements.txt b/appengine/flexible/extending_runtime/requirements.txt
similarity index 100%
rename from managed_vms/extending_runtime/requirements.txt
rename to appengine/flexible/extending_runtime/requirements.txt
diff --git a/managed_vms/extending_runtime_compat/.dockerignore b/appengine/flexible/extending_runtime_compat/.dockerignore
similarity index 100%
rename from managed_vms/extending_runtime_compat/.dockerignore
rename to appengine/flexible/extending_runtime_compat/.dockerignore
diff --git a/managed_vms/extending_runtime_compat/Dockerfile b/appengine/flexible/extending_runtime_compat/Dockerfile
similarity index 81%
rename from managed_vms/extending_runtime_compat/Dockerfile
rename to appengine/flexible/extending_runtime_compat/Dockerfile
index 7ca5c7f1657..1661ef8edff 100644
--- a/managed_vms/extending_runtime_compat/Dockerfile
+++ b/appengine/flexible/extending_runtime_compat/Dockerfile
@@ -1,4 +1,4 @@
-# Extend the Managed VMs python-compat runtime.
+# Extend the App Engine Flexible python-compat runtime.
 FROM gcr.io/google_appengine/python-compat-multicore
 
 # Install the fortunes binary from the debian repositories.
diff --git a/managed_vms/extending_runtime_compat/README.md b/appengine/flexible/extending_runtime_compat/README.md
similarity index 72%
rename from managed_vms/extending_runtime_compat/README.md
rename to appengine/flexible/extending_runtime_compat/README.md
index 47c545d9e70..827d300ae84 100644
--- a/managed_vms/extending_runtime_compat/README.md
+++ b/appengine/flexible/extending_runtime_compat/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs extending runtime python-compat
+## Google App Engine Flexible Environment extending runtime python-compat
 
-This sample demonstrates how to extend the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Managed VMs](https://cloud.google.com/appengine/docs/python/managed-vms/hello-world)
+This sample demonstrates how to extend the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Flexible Environment](https://cloud.google.com/python/getting-started/hello-world)
 
 ### Running & deploying the sample
 
diff --git a/managed_vms/extending_runtime_compat/app.yaml b/appengine/flexible/extending_runtime_compat/app.yaml
similarity index 100%
rename from managed_vms/extending_runtime_compat/app.yaml
rename to appengine/flexible/extending_runtime_compat/app.yaml
diff --git a/managed_vms/extending_runtime_compat/main.py b/appengine/flexible/extending_runtime_compat/main.py
similarity index 100%
rename from managed_vms/extending_runtime_compat/main.py
rename to appengine/flexible/extending_runtime_compat/main.py
diff --git a/managed_vms/extending_runtime_compat/main_test.py b/appengine/flexible/extending_runtime_compat/main_test.py
similarity index 100%
rename from managed_vms/extending_runtime_compat/main_test.py
rename to appengine/flexible/extending_runtime_compat/main_test.py
diff --git a/appengine/ndb/transactions/requirements.txt b/appengine/flexible/extending_runtime_compat/requirements.txt
similarity index 100%
rename from appengine/ndb/transactions/requirements.txt
rename to appengine/flexible/extending_runtime_compat/requirements.txt
diff --git a/managed_vms/hello_world/app.yaml b/appengine/flexible/hello_world/app.yaml
similarity index 100%
rename from managed_vms/hello_world/app.yaml
rename to appengine/flexible/hello_world/app.yaml
diff --git a/managed_vms/hello_world/main.py b/appengine/flexible/hello_world/main.py
similarity index 100%
rename from managed_vms/hello_world/main.py
rename to appengine/flexible/hello_world/main.py
diff --git a/managed_vms/hello_world/main_test.py b/appengine/flexible/hello_world/main_test.py
similarity index 100%
rename from managed_vms/hello_world/main_test.py
rename to appengine/flexible/hello_world/main_test.py
diff --git a/managed_vms/hello_world/requirements.txt b/appengine/flexible/hello_world/requirements.txt
similarity index 100%
rename from managed_vms/hello_world/requirements.txt
rename to appengine/flexible/hello_world/requirements.txt
diff --git a/managed_vms/hello_world_compat/README.md b/appengine/flexible/hello_world_compat/README.md
similarity index 72%
rename from managed_vms/hello_world_compat/README.md
rename to appengine/flexible/hello_world_compat/README.md
index 2b63f050a97..a29c4f905a8 100644
--- a/managed_vms/hello_world_compat/README.md
+++ b/appengine/flexible/hello_world_compat/README.md
@@ -1,6 +1,6 @@
-## Google App Engine Managed VMs python-compat Hello World
+## Google App Engine Flexible Environment python-compat Hello World
 
-This sample demonstrates using the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Managed VMs](https://cloud.google.com/appengine/docs/python/managed-vms/hello-world)
+This sample demonstrates using the [python-compat](https://cloud.google.com/appengine/docs/managed-vms/python/migrating-an-existing-app) runtime on [Google App Engine Flexible Environment](https://cloud.google.com/python/getting-started/hello-world)
 
 ### Running & deploying the sample
 
diff --git a/managed_vms/hello_world_compat/app.yaml b/appengine/flexible/hello_world_compat/app.yaml
similarity index 100%
rename from managed_vms/hello_world_compat/app.yaml
rename to appengine/flexible/hello_world_compat/app.yaml
diff --git a/managed_vms/hello_world_compat/main.py b/appengine/flexible/hello_world_compat/main.py
similarity index 100%
rename from managed_vms/hello_world_compat/main.py
rename to appengine/flexible/hello_world_compat/main.py
diff --git a/managed_vms/hello_world_compat/main_test.py b/appengine/flexible/hello_world_compat/main_test.py
similarity index 100%
rename from managed_vms/hello_world_compat/main_test.py
rename to appengine/flexible/hello_world_compat/main_test.py
diff --git a/managed_vms/extending_runtime_compat/requirements.txt b/appengine/flexible/hello_world_compat/requirements.txt
similarity index 100%
rename from managed_vms/extending_runtime_compat/requirements.txt
rename to appengine/flexible/hello_world_compat/requirements.txt
diff --git a/managed_vms/hello_world_django/.gitignore b/appengine/flexible/hello_world_django/.gitignore
similarity index 100%
rename from managed_vms/hello_world_django/.gitignore
rename to appengine/flexible/hello_world_django/.gitignore
diff --git a/managed_vms/hello_world_django/README.md b/appengine/flexible/hello_world_django/README.md
similarity index 93%
rename from managed_vms/hello_world_django/README.md
rename to appengine/flexible/hello_world_django/README.md
index 4eddd7965ee..61b9a72579f 100644
--- a/managed_vms/hello_world_django/README.md
+++ b/appengine/flexible/hello_world_django/README.md
@@ -1,7 +1,7 @@
-# Django sample for Google App Engine Managed VMs
+# Django sample for Google App Engine Flexible Environment
 
 This is a basic hello world [Django](https://www.djangoproject.com/) example
-for [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+for [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Running locally
 
diff --git a/managed_vms/hello_world_django/app.yaml b/appengine/flexible/hello_world_django/app.yaml
similarity index 100%
rename from managed_vms/hello_world_django/app.yaml
rename to appengine/flexible/hello_world_django/app.yaml
diff --git a/managed_vms/django_cloudsql/polls/__init__.py b/appengine/flexible/hello_world_django/helloworld/__init__.py
similarity index 100%
rename from managed_vms/django_cloudsql/polls/__init__.py
rename to appengine/flexible/hello_world_django/helloworld/__init__.py
diff --git a/managed_vms/hello_world_django/helloworld/views.py b/appengine/flexible/hello_world_django/helloworld/views.py
similarity index 100%
rename from managed_vms/hello_world_django/helloworld/views.py
rename to appengine/flexible/hello_world_django/helloworld/views.py
diff --git a/managed_vms/hello_world_django/manage.py b/appengine/flexible/hello_world_django/manage.py
similarity index 100%
rename from managed_vms/hello_world_django/manage.py
rename to appengine/flexible/hello_world_django/manage.py
diff --git a/managed_vms/hello_world_django/helloworld/__init__.py b/appengine/flexible/hello_world_django/project_name/__init__.py
similarity index 100%
rename from managed_vms/hello_world_django/helloworld/__init__.py
rename to appengine/flexible/hello_world_django/project_name/__init__.py
diff --git a/managed_vms/hello_world_django/project_name/settings.py b/appengine/flexible/hello_world_django/project_name/settings.py
similarity index 100%
rename from managed_vms/hello_world_django/project_name/settings.py
rename to appengine/flexible/hello_world_django/project_name/settings.py
diff --git a/managed_vms/hello_world_django/project_name/urls.py b/appengine/flexible/hello_world_django/project_name/urls.py
similarity index 100%
rename from managed_vms/hello_world_django/project_name/urls.py
rename to appengine/flexible/hello_world_django/project_name/urls.py
diff --git a/managed_vms/hello_world_django/project_name/wsgi.py b/appengine/flexible/hello_world_django/project_name/wsgi.py
similarity index 100%
rename from managed_vms/hello_world_django/project_name/wsgi.py
rename to appengine/flexible/hello_world_django/project_name/wsgi.py
diff --git a/managed_vms/hello_world_django/requirements.txt b/appengine/flexible/hello_world_django/requirements.txt
similarity index 100%
rename from managed_vms/hello_world_django/requirements.txt
rename to appengine/flexible/hello_world_django/requirements.txt
diff --git a/managed_vms/kinto/Dockerfile b/appengine/flexible/kinto/Dockerfile
similarity index 100%
rename from managed_vms/kinto/Dockerfile
rename to appengine/flexible/kinto/Dockerfile
diff --git a/managed_vms/kinto/README.md b/appengine/flexible/kinto/README.md
similarity index 86%
rename from managed_vms/kinto/README.md
rename to appengine/flexible/kinto/README.md
index 07918a143ad..9dfdebccc49 100644
--- a/managed_vms/kinto/README.md
+++ b/appengine/flexible/kinto/README.md
@@ -1,7 +1,7 @@
 # Kinto Example
 
 This is a basic example of running Mozillas [Kinto](https://github.com/Kinto/kinto/blob/master/docs/index.rst)
-on Managed VMs. Kinto provides a framework to sync JSON data across many devices and provide push notifications.
+on App Engine Flexible. Kinto provides a framework to sync JSON data across many devices and provide push notifications.
 This example uses a custom runtime to install Kinto and edit the config to run it on port 8080, which is the port that
 the base Docker image is expecting. 
 
diff --git a/managed_vms/kinto/app.yaml b/appengine/flexible/kinto/app.yaml
similarity index 90%
rename from managed_vms/kinto/app.yaml
rename to appengine/flexible/kinto/app.yaml
index 6819c1facc9..84b39a70522 100644
--- a/managed_vms/kinto/app.yaml
+++ b/appengine/flexible/kinto/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This file specifies your Python application's runtime configuration.
-# See https://cloud.google.com/appengine/docs/managed-vms/config for details.
+# See https://cloud.google.com/appengine/docs/flexible/python/configuring-your-app-with-app-yaml
 
 runtime: custom
 vm: true
diff --git a/managed_vms/kinto/requirements.txt b/appengine/flexible/kinto/requirements.txt
similarity index 100%
rename from managed_vms/kinto/requirements.txt
rename to appengine/flexible/kinto/requirements.txt
diff --git a/managed_vms/mailgun/README.md b/appengine/flexible/mailgun/README.md
similarity index 84%
rename from managed_vms/mailgun/README.md
rename to appengine/flexible/mailgun/README.md
index e1f7704aedc..92703fa1859 100644
--- a/managed_vms/mailgun/README.md
+++ b/appengine/flexible/mailgun/README.md
@@ -1,6 +1,6 @@
-# Python Mailgun email sample for Google App Engine Managed VMs
+# Python Mailgun email sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Mailgun](https://www.mailgun.com) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 For more information about Mail, see their [documentation](https://documentation.mailgun.com/).
 
diff --git a/managed_vms/mailgun/app.yaml b/appengine/flexible/mailgun/app.yaml
similarity index 100%
rename from managed_vms/mailgun/app.yaml
rename to appengine/flexible/mailgun/app.yaml
diff --git a/managed_vms/mailgun/example-attachment.txt b/appengine/flexible/mailgun/example-attachment.txt
similarity index 100%
rename from managed_vms/mailgun/example-attachment.txt
rename to appengine/flexible/mailgun/example-attachment.txt
diff --git a/managed_vms/mailgun/main.py b/appengine/flexible/mailgun/main.py
similarity index 100%
rename from managed_vms/mailgun/main.py
rename to appengine/flexible/mailgun/main.py
diff --git a/managed_vms/mailgun/main_test.py b/appengine/flexible/mailgun/main_test.py
similarity index 100%
rename from managed_vms/mailgun/main_test.py
rename to appengine/flexible/mailgun/main_test.py
diff --git a/managed_vms/mailgun/requirements.txt b/appengine/flexible/mailgun/requirements.txt
similarity index 100%
rename from managed_vms/mailgun/requirements.txt
rename to appengine/flexible/mailgun/requirements.txt
diff --git a/managed_vms/mailgun/templates/index.html b/appengine/flexible/mailgun/templates/index.html
similarity index 93%
rename from managed_vms/mailgun/templates/index.html
rename to appengine/flexible/mailgun/templates/index.html
index 9966bb6fd61..1aa0f319050 100644
--- a/managed_vms/mailgun/templates/index.html
+++ b/appengine/flexible/mailgun/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Codestin Search App</title>
+  <title>Codestin Search App</title>
 </head>
 <body>
 <!-- [START form] -->
diff --git a/managed_vms/mailjet/README.md b/appengine/flexible/mailjet/README.md
similarity index 100%
rename from managed_vms/mailjet/README.md
rename to appengine/flexible/mailjet/README.md
diff --git a/managed_vms/mailjet/app.yaml b/appengine/flexible/mailjet/app.yaml
similarity index 100%
rename from managed_vms/mailjet/app.yaml
rename to appengine/flexible/mailjet/app.yaml
diff --git a/managed_vms/mailjet/main.py b/appengine/flexible/mailjet/main.py
similarity index 100%
rename from managed_vms/mailjet/main.py
rename to appengine/flexible/mailjet/main.py
diff --git a/appengine/mailjet/main_test.py b/appengine/flexible/mailjet/main_test.py
similarity index 100%
rename from appengine/mailjet/main_test.py
rename to appengine/flexible/mailjet/main_test.py
diff --git a/managed_vms/mailjet/requirements.txt b/appengine/flexible/mailjet/requirements.txt
similarity index 100%
rename from managed_vms/mailjet/requirements.txt
rename to appengine/flexible/mailjet/requirements.txt
diff --git a/managed_vms/mailjet/templates/index.html b/appengine/flexible/mailjet/templates/index.html
similarity index 100%
rename from managed_vms/mailjet/templates/index.html
rename to appengine/flexible/mailjet/templates/index.html
diff --git a/managed_vms/memcache/app.yaml b/appengine/flexible/memcache/app.yaml
similarity index 100%
rename from managed_vms/memcache/app.yaml
rename to appengine/flexible/memcache/app.yaml
diff --git a/managed_vms/memcache/main.py b/appengine/flexible/memcache/main.py
similarity index 100%
rename from managed_vms/memcache/main.py
rename to appengine/flexible/memcache/main.py
diff --git a/managed_vms/memcache/main_test.py b/appengine/flexible/memcache/main_test.py
similarity index 100%
rename from managed_vms/memcache/main_test.py
rename to appengine/flexible/memcache/main_test.py
diff --git a/managed_vms/memcache/requirements.txt b/appengine/flexible/memcache/requirements.txt
similarity index 100%
rename from managed_vms/memcache/requirements.txt
rename to appengine/flexible/memcache/requirements.txt
diff --git a/managed_vms/pubsub/README.md b/appengine/flexible/pubsub/README.md
similarity index 94%
rename from managed_vms/pubsub/README.md
rename to appengine/flexible/pubsub/README.md
index c69e89af6c6..75d12b88e97 100644
--- a/managed_vms/pubsub/README.md
+++ b/appengine/flexible/pubsub/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Pub/Sub sample for Google App Engine Managed VMs
+# Python Google Cloud Pub/Sub sample for Google App Engine Flexible Environment
 
-This demonstrates how to send and receive messages using [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This demonstrates how to send and receive messages using [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/pubsub/app.yaml b/appengine/flexible/pubsub/app.yaml
similarity index 100%
rename from managed_vms/pubsub/app.yaml
rename to appengine/flexible/pubsub/app.yaml
diff --git a/managed_vms/pubsub/main.py b/appengine/flexible/pubsub/main.py
similarity index 100%
rename from managed_vms/pubsub/main.py
rename to appengine/flexible/pubsub/main.py
diff --git a/managed_vms/pubsub/main_test.py b/appengine/flexible/pubsub/main_test.py
similarity index 100%
rename from managed_vms/pubsub/main_test.py
rename to appengine/flexible/pubsub/main_test.py
diff --git a/managed_vms/pubsub/requirements.txt b/appengine/flexible/pubsub/requirements.txt
similarity index 100%
rename from managed_vms/pubsub/requirements.txt
rename to appengine/flexible/pubsub/requirements.txt
diff --git a/managed_vms/pubsub/sample_message.json b/appengine/flexible/pubsub/sample_message.json
similarity index 100%
rename from managed_vms/pubsub/sample_message.json
rename to appengine/flexible/pubsub/sample_message.json
diff --git a/managed_vms/pubsub/templates/index.html b/appengine/flexible/pubsub/templates/index.html
similarity index 93%
rename from managed_vms/pubsub/templates/index.html
rename to appengine/flexible/pubsub/templates/index.html
index 2d4ff27fe21..398fd9de21e 100644
--- a/managed_vms/pubsub/templates/index.html
+++ b/appengine/flexible/pubsub/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Codestin Search App</title>
+  <title>Codestin Search App</title>
 </head>
 <body>
 <div>
diff --git a/managed_vms/sendgrid/README.md b/appengine/flexible/sendgrid/README.md
similarity index 86%
rename from managed_vms/sendgrid/README.md
rename to appengine/flexible/sendgrid/README.md
index db6dd1cb91e..a709ae7ff05 100644
--- a/managed_vms/sendgrid/README.md
+++ b/appengine/flexible/sendgrid/README.md
@@ -1,6 +1,6 @@
-# Python SendGrid email sample for Google App Engine Managed VMs
+# Python SendGrid email sample for Google App Engine Flexible
 
-This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on [Google App Engine Flexible](https://cloud.google.com/appengine).
 
 For more information about SendGrid, see their [documentation](https://sendgrid.com/docs/User_Guide/index.html).
 
diff --git a/managed_vms/sendgrid/app.yaml b/appengine/flexible/sendgrid/app.yaml
similarity index 100%
rename from managed_vms/sendgrid/app.yaml
rename to appengine/flexible/sendgrid/app.yaml
diff --git a/managed_vms/sendgrid/main.py b/appengine/flexible/sendgrid/main.py
similarity index 100%
rename from managed_vms/sendgrid/main.py
rename to appengine/flexible/sendgrid/main.py
diff --git a/managed_vms/sendgrid/main_test.py b/appengine/flexible/sendgrid/main_test.py
similarity index 100%
rename from managed_vms/sendgrid/main_test.py
rename to appengine/flexible/sendgrid/main_test.py
diff --git a/managed_vms/sendgrid/requirements.txt b/appengine/flexible/sendgrid/requirements.txt
similarity index 100%
rename from managed_vms/sendgrid/requirements.txt
rename to appengine/flexible/sendgrid/requirements.txt
diff --git a/managed_vms/sendgrid/templates/index.html b/appengine/flexible/sendgrid/templates/index.html
similarity index 92%
rename from managed_vms/sendgrid/templates/index.html
rename to appengine/flexible/sendgrid/templates/index.html
index b53ff6cdb9c..db095f71789 100644
--- a/managed_vms/sendgrid/templates/index.html
+++ b/appengine/flexible/sendgrid/templates/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Codestin Search App</title>
+  <title>Codestin Search App</title>
 </head>
 <body>
 <!-- [START form] -->
diff --git a/managed_vms/static_files/README.md b/appengine/flexible/static_files/README.md
similarity index 83%
rename from managed_vms/static_files/README.md
rename to appengine/flexible/static_files/README.md
index 6db9e84a74d..a2b38d0d633 100644
--- a/managed_vms/static_files/README.md
+++ b/appengine/flexible/static_files/README.md
@@ -1,4 +1,4 @@
-# Python / Flask static files sample for Google App Engine Managed VMs
+# Python / Flask static files sample for Google App Engine Flexible Environment
 
 This demonstrates how to use [Flask](http://flask.pocoo.org/) to serve static files in your application.
 
diff --git a/managed_vms/static_files/app.yaml b/appengine/flexible/static_files/app.yaml
similarity index 100%
rename from managed_vms/static_files/app.yaml
rename to appengine/flexible/static_files/app.yaml
diff --git a/managed_vms/static_files/main.py b/appengine/flexible/static_files/main.py
similarity index 100%
rename from managed_vms/static_files/main.py
rename to appengine/flexible/static_files/main.py
diff --git a/managed_vms/static_files/main_test.py b/appengine/flexible/static_files/main_test.py
similarity index 100%
rename from managed_vms/static_files/main_test.py
rename to appengine/flexible/static_files/main_test.py
diff --git a/managed_vms/static_files/requirements.txt b/appengine/flexible/static_files/requirements.txt
similarity index 100%
rename from managed_vms/static_files/requirements.txt
rename to appengine/flexible/static_files/requirements.txt
diff --git a/managed_vms/static_files/static/main.css b/appengine/flexible/static_files/static/main.css
similarity index 100%
rename from managed_vms/static_files/static/main.css
rename to appengine/flexible/static_files/static/main.css
diff --git a/managed_vms/static_files/templates/index.html b/appengine/flexible/static_files/templates/index.html
similarity index 100%
rename from managed_vms/static_files/templates/index.html
rename to appengine/flexible/static_files/templates/index.html
diff --git a/managed_vms/storage/README.md b/appengine/flexible/storage/README.md
similarity index 86%
rename from managed_vms/storage/README.md
rename to appengine/flexible/storage/README.md
index 6b7d977f76b..c2ba0fa18de 100644
--- a/managed_vms/storage/README.md
+++ b/appengine/flexible/storage/README.md
@@ -1,6 +1,6 @@
-# Python Google Cloud Storage sample for Google App Engine Managed VMs
+# Python Google Cloud Storage sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Google Cloud Storage](https://cloud.google.com/storage/) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Google Cloud Storage](https://cloud.google.com/storage/) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/storage/app.yaml b/appengine/flexible/storage/app.yaml
similarity index 100%
rename from managed_vms/storage/app.yaml
rename to appengine/flexible/storage/app.yaml
diff --git a/managed_vms/storage/main.py b/appengine/flexible/storage/main.py
similarity index 100%
rename from managed_vms/storage/main.py
rename to appengine/flexible/storage/main.py
diff --git a/managed_vms/storage/main_test.py b/appengine/flexible/storage/main_test.py
similarity index 100%
rename from managed_vms/storage/main_test.py
rename to appengine/flexible/storage/main_test.py
diff --git a/managed_vms/storage/requirements.txt b/appengine/flexible/storage/requirements.txt
similarity index 100%
rename from managed_vms/storage/requirements.txt
rename to appengine/flexible/storage/requirements.txt
diff --git a/managed_vms/twilio/README.md b/appengine/flexible/twilio/README.md
similarity index 87%
rename from managed_vms/twilio/README.md
rename to appengine/flexible/twilio/README.md
index 9aadc1a23f9..b93af17be7c 100644
--- a/managed_vms/twilio/README.md
+++ b/appengine/flexible/twilio/README.md
@@ -1,6 +1,6 @@
-# Python Twilio voice and SMS sample for Google App Engine Managed VMs
+# Python Twilio voice and SMS sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 For more information about Twilio, see their [Python quickstart tutorials](https://www.twilio.com/docs/quickstart/python).
 
diff --git a/managed_vms/twilio/app.yaml b/appengine/flexible/twilio/app.yaml
similarity index 100%
rename from managed_vms/twilio/app.yaml
rename to appengine/flexible/twilio/app.yaml
diff --git a/managed_vms/twilio/main.py b/appengine/flexible/twilio/main.py
similarity index 100%
rename from managed_vms/twilio/main.py
rename to appengine/flexible/twilio/main.py
diff --git a/managed_vms/twilio/main_test.py b/appengine/flexible/twilio/main_test.py
similarity index 100%
rename from managed_vms/twilio/main_test.py
rename to appengine/flexible/twilio/main_test.py
diff --git a/managed_vms/twilio/requirements.txt b/appengine/flexible/twilio/requirements.txt
similarity index 100%
rename from managed_vms/twilio/requirements.txt
rename to appengine/flexible/twilio/requirements.txt
diff --git a/managed_vms/websockets/README.md b/appengine/flexible/websockets/README.md
similarity index 88%
rename from managed_vms/websockets/README.md
rename to appengine/flexible/websockets/README.md
index 809e96c21e5..0f58f8696ad 100644
--- a/managed_vms/websockets/README.md
+++ b/appengine/flexible/websockets/README.md
@@ -1,6 +1,6 @@
-# Python websockets sample for Google App Engine Managed VMs
+# Python websockets sample for Google App Engine Flexible Environment
 
-This sample demonstrates how to use websockets on [Google App Engine Managed VMs](https://cloud.google.com/appengine).
+This sample demonstrates how to use websockets on [Google App Engine Flexible Environment](https://cloud.google.com/appengine).
 
 ## Setup
 
diff --git a/managed_vms/websockets/app.yaml b/appengine/flexible/websockets/app.yaml
similarity index 100%
rename from managed_vms/websockets/app.yaml
rename to appengine/flexible/websockets/app.yaml
diff --git a/managed_vms/websockets/main.py b/appengine/flexible/websockets/main.py
similarity index 100%
rename from managed_vms/websockets/main.py
rename to appengine/flexible/websockets/main.py
diff --git a/managed_vms/websockets/requirements.txt b/appengine/flexible/websockets/requirements.txt
similarity index 100%
rename from managed_vms/websockets/requirements.txt
rename to appengine/flexible/websockets/requirements.txt
diff --git a/managed_vms/websockets/templates/index.html b/appengine/flexible/websockets/templates/index.html
similarity index 96%
rename from managed_vms/websockets/templates/index.html
rename to appengine/flexible/websockets/templates/index.html
index 50fea246f00..fb8fedc2ccf 100644
--- a/managed_vms/websockets/templates/index.html
+++ b/appengine/flexible/websockets/templates/index.html
@@ -17,7 +17,7 @@
 <!doctype html>
 <html>
 <head>
-  <title>Codestin Search App</title>
+  <title>Codestin Search App</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
diff --git a/appengine/README.md b/appengine/standard/README.md
similarity index 100%
rename from appengine/README.md
rename to appengine/standard/README.md
diff --git a/managed_vms/hello_world_django/project_name/__init__.py b/appengine/standard/__init__.py
similarity index 100%
rename from managed_vms/hello_world_django/project_name/__init__.py
rename to appengine/standard/__init__.py
diff --git a/appengine/angular/README.md b/appengine/standard/angular/README.md
similarity index 100%
rename from appengine/angular/README.md
rename to appengine/standard/angular/README.md
diff --git a/appengine/angular/app.yaml b/appengine/standard/angular/app.yaml
similarity index 100%
rename from appengine/angular/app.yaml
rename to appengine/standard/angular/app.yaml
diff --git a/appengine/angular/app/css/app.css b/appengine/standard/angular/app/css/app.css
similarity index 100%
rename from appengine/angular/app/css/app.css
rename to appengine/standard/angular/app/css/app.css
diff --git a/appengine/angular/app/index.html b/appengine/standard/angular/app/index.html
similarity index 100%
rename from appengine/angular/app/index.html
rename to appengine/standard/angular/app/index.html
diff --git a/appengine/angular/app/js/app.js b/appengine/standard/angular/app/js/app.js
similarity index 100%
rename from appengine/angular/app/js/app.js
rename to appengine/standard/angular/app/js/app.js
diff --git a/appengine/angular/app/partials/insert.html b/appengine/standard/angular/app/partials/insert.html
similarity index 100%
rename from appengine/angular/app/partials/insert.html
rename to appengine/standard/angular/app/partials/insert.html
diff --git a/appengine/angular/app/partials/main.html b/appengine/standard/angular/app/partials/main.html
similarity index 100%
rename from appengine/angular/app/partials/main.html
rename to appengine/standard/angular/app/partials/main.html
diff --git a/appengine/angular/app/partials/update.html b/appengine/standard/angular/app/partials/update.html
similarity index 100%
rename from appengine/angular/app/partials/update.html
rename to appengine/standard/angular/app/partials/update.html
diff --git a/appengine/angular/main.py b/appengine/standard/angular/main.py
similarity index 100%
rename from appengine/angular/main.py
rename to appengine/standard/angular/main.py
diff --git a/appengine/angular/model.py b/appengine/standard/angular/model.py
similarity index 100%
rename from appengine/angular/model.py
rename to appengine/standard/angular/model.py
diff --git a/appengine/angular/scripts/deploy.sh b/appengine/standard/angular/scripts/deploy.sh
similarity index 100%
rename from appengine/angular/scripts/deploy.sh
rename to appengine/standard/angular/scripts/deploy.sh
diff --git a/appengine/angular/scripts/run.sh b/appengine/standard/angular/scripts/run.sh
similarity index 100%
rename from appengine/angular/scripts/run.sh
rename to appengine/standard/angular/scripts/run.sh
diff --git a/appengine/app_identity/asserting/app.yaml b/appengine/standard/app_identity/asserting/app.yaml
similarity index 100%
rename from appengine/app_identity/asserting/app.yaml
rename to appengine/standard/app_identity/asserting/app.yaml
diff --git a/appengine/app_identity/asserting/main.py b/appengine/standard/app_identity/asserting/main.py
similarity index 100%
rename from appengine/app_identity/asserting/main.py
rename to appengine/standard/app_identity/asserting/main.py
diff --git a/appengine/app_identity/asserting/main_test.py b/appengine/standard/app_identity/asserting/main_test.py
similarity index 100%
rename from appengine/app_identity/asserting/main_test.py
rename to appengine/standard/app_identity/asserting/main_test.py
diff --git a/appengine/app_identity/incoming/app.yaml b/appengine/standard/app_identity/incoming/app.yaml
similarity index 100%
rename from appengine/app_identity/incoming/app.yaml
rename to appengine/standard/app_identity/incoming/app.yaml
diff --git a/appengine/app_identity/incoming/main.py b/appengine/standard/app_identity/incoming/main.py
similarity index 100%
rename from appengine/app_identity/incoming/main.py
rename to appengine/standard/app_identity/incoming/main.py
diff --git a/appengine/app_identity/incoming/main_test.py b/appengine/standard/app_identity/incoming/main_test.py
similarity index 100%
rename from appengine/app_identity/incoming/main_test.py
rename to appengine/standard/app_identity/incoming/main_test.py
diff --git a/appengine/app_identity/signing/app.yaml b/appengine/standard/app_identity/signing/app.yaml
similarity index 100%
rename from appengine/app_identity/signing/app.yaml
rename to appengine/standard/app_identity/signing/app.yaml
diff --git a/appengine/app_identity/signing/main.py b/appengine/standard/app_identity/signing/main.py
similarity index 100%
rename from appengine/app_identity/signing/main.py
rename to appengine/standard/app_identity/signing/main.py
diff --git a/appengine/app_identity/signing/main_test.py b/appengine/standard/app_identity/signing/main_test.py
similarity index 100%
rename from appengine/app_identity/signing/main_test.py
rename to appengine/standard/app_identity/signing/main_test.py
diff --git a/appengine/appstats/app.yaml b/appengine/standard/appstats/app.yaml
similarity index 100%
rename from appengine/appstats/app.yaml
rename to appengine/standard/appstats/app.yaml
diff --git a/appengine/appstats/appengine_config.py b/appengine/standard/appstats/appengine_config.py
similarity index 100%
rename from appengine/appstats/appengine_config.py
rename to appengine/standard/appstats/appengine_config.py
diff --git a/appengine/appstats/main.py b/appengine/standard/appstats/main.py
similarity index 100%
rename from appengine/appstats/main.py
rename to appengine/standard/appstats/main.py
diff --git a/appengine/appstats/main_test.py b/appengine/standard/appstats/main_test.py
similarity index 100%
rename from appengine/appstats/main_test.py
rename to appengine/standard/appstats/main_test.py
diff --git a/appengine/background/README.md b/appengine/standard/background/README.md
similarity index 100%
rename from appengine/background/README.md
rename to appengine/standard/background/README.md
diff --git a/appengine/background/app.yaml b/appengine/standard/background/app.yaml
similarity index 100%
rename from appengine/background/app.yaml
rename to appengine/standard/background/app.yaml
diff --git a/appengine/background/main.py b/appengine/standard/background/main.py
similarity index 100%
rename from appengine/background/main.py
rename to appengine/standard/background/main.py
diff --git a/appengine/background/main_test.py b/appengine/standard/background/main_test.py
similarity index 100%
rename from appengine/background/main_test.py
rename to appengine/standard/background/main_test.py
diff --git a/appengine/bigquery/.gitignore b/appengine/standard/bigquery/.gitignore
similarity index 100%
rename from appengine/bigquery/.gitignore
rename to appengine/standard/bigquery/.gitignore
diff --git a/appengine/bigquery/README.md b/appengine/standard/bigquery/README.md
similarity index 100%
rename from appengine/bigquery/README.md
rename to appengine/standard/bigquery/README.md
diff --git a/appengine/bigquery/app.yaml b/appengine/standard/bigquery/app.yaml
similarity index 100%
rename from appengine/bigquery/app.yaml
rename to appengine/standard/bigquery/app.yaml
diff --git a/appengine/bigquery/appengine_config.py b/appengine/standard/bigquery/appengine_config.py
similarity index 100%
rename from appengine/bigquery/appengine_config.py
rename to appengine/standard/bigquery/appengine_config.py
diff --git a/appengine/bigquery/client_secrets.json b/appengine/standard/bigquery/client_secrets.json
similarity index 100%
rename from appengine/bigquery/client_secrets.json
rename to appengine/standard/bigquery/client_secrets.json
diff --git a/appengine/bigquery/main.py b/appengine/standard/bigquery/main.py
similarity index 100%
rename from appengine/bigquery/main.py
rename to appengine/standard/bigquery/main.py
diff --git a/appengine/bigquery/main_test.py b/appengine/standard/bigquery/main_test.py
similarity index 100%
rename from appengine/bigquery/main_test.py
rename to appengine/standard/bigquery/main_test.py
diff --git a/appengine/bigquery/requirements.txt b/appengine/standard/bigquery/requirements.txt
similarity index 100%
rename from appengine/bigquery/requirements.txt
rename to appengine/standard/bigquery/requirements.txt
diff --git a/appengine/bigquery/resources/datasets-list.json b/appengine/standard/bigquery/resources/datasets-list.json
similarity index 100%
rename from appengine/bigquery/resources/datasets-list.json
rename to appengine/standard/bigquery/resources/datasets-list.json
diff --git a/appengine/blobstore/README.md b/appengine/standard/blobstore/README.md
similarity index 100%
rename from appengine/blobstore/README.md
rename to appengine/standard/blobstore/README.md
diff --git a/appengine/blobstore/app.yaml b/appengine/standard/blobstore/app.yaml
similarity index 100%
rename from appengine/blobstore/app.yaml
rename to appengine/standard/blobstore/app.yaml
diff --git a/appengine/blobstore/main.py b/appengine/standard/blobstore/main.py
similarity index 100%
rename from appengine/blobstore/main.py
rename to appengine/standard/blobstore/main.py
diff --git a/appengine/blobstore/main_test.py b/appengine/standard/blobstore/main_test.py
similarity index 100%
rename from appengine/blobstore/main_test.py
rename to appengine/standard/blobstore/main_test.py
diff --git a/appengine/channel/README.md b/appengine/standard/channel/README.md
similarity index 100%
rename from appengine/channel/README.md
rename to appengine/standard/channel/README.md
diff --git a/appengine/channel/app.yaml b/appengine/standard/channel/app.yaml
similarity index 100%
rename from appengine/channel/app.yaml
rename to appengine/standard/channel/app.yaml
diff --git a/appengine/channel/chatactoe.py b/appengine/standard/channel/chatactoe.py
similarity index 100%
rename from appengine/channel/chatactoe.py
rename to appengine/standard/channel/chatactoe.py
diff --git a/appengine/channel/index.html b/appengine/standard/channel/index.html
similarity index 100%
rename from appengine/channel/index.html
rename to appengine/standard/channel/index.html
diff --git a/appengine/cloudsql/README.md b/appengine/standard/cloudsql/README.md
similarity index 100%
rename from appengine/cloudsql/README.md
rename to appengine/standard/cloudsql/README.md
diff --git a/appengine/cloudsql/app.yaml b/appengine/standard/cloudsql/app.yaml
similarity index 100%
rename from appengine/cloudsql/app.yaml
rename to appengine/standard/cloudsql/app.yaml
diff --git a/appengine/cloudsql/main.py b/appengine/standard/cloudsql/main.py
similarity index 100%
rename from appengine/cloudsql/main.py
rename to appengine/standard/cloudsql/main.py
diff --git a/appengine/cloudsql/main_test.py b/appengine/standard/cloudsql/main_test.py
similarity index 100%
rename from appengine/cloudsql/main_test.py
rename to appengine/standard/cloudsql/main_test.py
diff --git a/appengine/conftest.py b/appengine/standard/conftest.py
similarity index 100%
rename from appengine/conftest.py
rename to appengine/standard/conftest.py
diff --git a/appengine/endpoints/backend/app.yaml b/appengine/standard/endpoints/backend/app.yaml
similarity index 100%
rename from appengine/endpoints/backend/app.yaml
rename to appengine/standard/endpoints/backend/app.yaml
diff --git a/appengine/endpoints/backend/main.py b/appengine/standard/endpoints/backend/main.py
similarity index 100%
rename from appengine/endpoints/backend/main.py
rename to appengine/standard/endpoints/backend/main.py
diff --git a/appengine/endpoints/backend/main_test.py b/appengine/standard/endpoints/backend/main_test.py
similarity index 100%
rename from appengine/endpoints/backend/main_test.py
rename to appengine/standard/endpoints/backend/main_test.py
diff --git a/appengine/endpoints/multiapi/app.yaml b/appengine/standard/endpoints/multiapi/app.yaml
similarity index 100%
rename from appengine/endpoints/multiapi/app.yaml
rename to appengine/standard/endpoints/multiapi/app.yaml
diff --git a/appengine/endpoints/multiapi/main.py b/appengine/standard/endpoints/multiapi/main.py
similarity index 100%
rename from appengine/endpoints/multiapi/main.py
rename to appengine/standard/endpoints/multiapi/main.py
diff --git a/appengine/endpoints/multiapi/main_test.py b/appengine/standard/endpoints/multiapi/main_test.py
similarity index 100%
rename from appengine/endpoints/multiapi/main_test.py
rename to appengine/standard/endpoints/multiapi/main_test.py
diff --git a/appengine/i18n/README.md b/appengine/standard/i18n/README.md
similarity index 100%
rename from appengine/i18n/README.md
rename to appengine/standard/i18n/README.md
diff --git a/appengine/i18n/app.yaml b/appengine/standard/i18n/app.yaml
similarity index 100%
rename from appengine/i18n/app.yaml
rename to appengine/standard/i18n/app.yaml
diff --git a/appengine/i18n/appengine_config.py b/appengine/standard/i18n/appengine_config.py
similarity index 100%
rename from appengine/i18n/appengine_config.py
rename to appengine/standard/i18n/appengine_config.py
diff --git a/appengine/i18n/i18n_utils.py b/appengine/standard/i18n/i18n_utils.py
similarity index 100%
rename from appengine/i18n/i18n_utils.py
rename to appengine/standard/i18n/i18n_utils.py
diff --git a/appengine/i18n/js.mapping b/appengine/standard/i18n/js.mapping
similarity index 100%
rename from appengine/i18n/js.mapping
rename to appengine/standard/i18n/js.mapping
diff --git a/appengine/i18n/locales/en/LC_MESSAGES/jsmessages.mo b/appengine/standard/i18n/locales/en/LC_MESSAGES/jsmessages.mo
similarity index 100%
rename from appengine/i18n/locales/en/LC_MESSAGES/jsmessages.mo
rename to appengine/standard/i18n/locales/en/LC_MESSAGES/jsmessages.mo
diff --git a/appengine/i18n/locales/en/LC_MESSAGES/jsmessages.po b/appengine/standard/i18n/locales/en/LC_MESSAGES/jsmessages.po
similarity index 100%
rename from appengine/i18n/locales/en/LC_MESSAGES/jsmessages.po
rename to appengine/standard/i18n/locales/en/LC_MESSAGES/jsmessages.po
diff --git a/appengine/i18n/locales/en/LC_MESSAGES/messages.mo b/appengine/standard/i18n/locales/en/LC_MESSAGES/messages.mo
similarity index 100%
rename from appengine/i18n/locales/en/LC_MESSAGES/messages.mo
rename to appengine/standard/i18n/locales/en/LC_MESSAGES/messages.mo
diff --git a/appengine/i18n/locales/en/LC_MESSAGES/messages.po b/appengine/standard/i18n/locales/en/LC_MESSAGES/messages.po
similarity index 100%
rename from appengine/i18n/locales/en/LC_MESSAGES/messages.po
rename to appengine/standard/i18n/locales/en/LC_MESSAGES/messages.po
diff --git a/appengine/i18n/locales/ja/LC_MESSAGES/jsmessages.mo b/appengine/standard/i18n/locales/ja/LC_MESSAGES/jsmessages.mo
similarity index 100%
rename from appengine/i18n/locales/ja/LC_MESSAGES/jsmessages.mo
rename to appengine/standard/i18n/locales/ja/LC_MESSAGES/jsmessages.mo
diff --git a/appengine/i18n/locales/ja/LC_MESSAGES/jsmessages.po b/appengine/standard/i18n/locales/ja/LC_MESSAGES/jsmessages.po
similarity index 100%
rename from appengine/i18n/locales/ja/LC_MESSAGES/jsmessages.po
rename to appengine/standard/i18n/locales/ja/LC_MESSAGES/jsmessages.po
diff --git a/appengine/i18n/locales/ja/LC_MESSAGES/messages.mo b/appengine/standard/i18n/locales/ja/LC_MESSAGES/messages.mo
similarity index 100%
rename from appengine/i18n/locales/ja/LC_MESSAGES/messages.mo
rename to appengine/standard/i18n/locales/ja/LC_MESSAGES/messages.mo
diff --git a/appengine/i18n/locales/ja/LC_MESSAGES/messages.po b/appengine/standard/i18n/locales/ja/LC_MESSAGES/messages.po
similarity index 100%
rename from appengine/i18n/locales/ja/LC_MESSAGES/messages.po
rename to appengine/standard/i18n/locales/ja/LC_MESSAGES/messages.po
diff --git a/appengine/i18n/locales/jsmessages.pot b/appengine/standard/i18n/locales/jsmessages.pot
similarity index 100%
rename from appengine/i18n/locales/jsmessages.pot
rename to appengine/standard/i18n/locales/jsmessages.pot
diff --git a/appengine/i18n/locales/messages.pot b/appengine/standard/i18n/locales/messages.pot
similarity index 100%
rename from appengine/i18n/locales/messages.pot
rename to appengine/standard/i18n/locales/messages.pot
diff --git a/appengine/i18n/locales/pl/LC_MESSAGES/jsmessages.mo b/appengine/standard/i18n/locales/pl/LC_MESSAGES/jsmessages.mo
similarity index 100%
rename from appengine/i18n/locales/pl/LC_MESSAGES/jsmessages.mo
rename to appengine/standard/i18n/locales/pl/LC_MESSAGES/jsmessages.mo
diff --git a/appengine/i18n/locales/pl/LC_MESSAGES/jsmessages.po b/appengine/standard/i18n/locales/pl/LC_MESSAGES/jsmessages.po
similarity index 100%
rename from appengine/i18n/locales/pl/LC_MESSAGES/jsmessages.po
rename to appengine/standard/i18n/locales/pl/LC_MESSAGES/jsmessages.po
diff --git a/appengine/i18n/main.mapping b/appengine/standard/i18n/main.mapping
similarity index 100%
rename from appengine/i18n/main.mapping
rename to appengine/standard/i18n/main.mapping
diff --git a/appengine/i18n/main.py b/appengine/standard/i18n/main.py
similarity index 100%
rename from appengine/i18n/main.py
rename to appengine/standard/i18n/main.py
diff --git a/appengine/i18n/static/js/main.js b/appengine/standard/i18n/static/js/main.js
similarity index 100%
rename from appengine/i18n/static/js/main.js
rename to appengine/standard/i18n/static/js/main.js
diff --git a/appengine/i18n/templates/i18n_js.jinja2 b/appengine/standard/i18n/templates/i18n_js.jinja2
similarity index 100%
rename from appengine/i18n/templates/i18n_js.jinja2
rename to appengine/standard/i18n/templates/i18n_js.jinja2
diff --git a/appengine/i18n/templates/index.jinja2 b/appengine/standard/i18n/templates/index.jinja2
similarity index 100%
rename from appengine/i18n/templates/index.jinja2
rename to appengine/standard/i18n/templates/index.jinja2
diff --git a/appengine/i18n/templates/javascript_tag.jinja2 b/appengine/standard/i18n/templates/javascript_tag.jinja2
similarity index 100%
rename from appengine/i18n/templates/javascript_tag.jinja2
rename to appengine/standard/i18n/templates/javascript_tag.jinja2
diff --git a/appengine/i18n/templates/null_i18n_js.jinja2 b/appengine/standard/i18n/templates/null_i18n_js.jinja2
similarity index 100%
rename from appengine/i18n/templates/null_i18n_js.jinja2
rename to appengine/standard/i18n/templates/null_i18n_js.jinja2
diff --git a/appengine/images/api/README.md b/appengine/standard/images/api/README.md
similarity index 89%
rename from appengine/images/api/README.md
rename to appengine/standard/images/api/README.md
index 1aa573887b9..787710dbf86 100644
--- a/appengine/images/api/README.md
+++ b/appengine/standard/images/api/README.md
@@ -10,4 +10,4 @@ These samples are used on the following documentation page:
 
 <!-- end-auto-doc-link -->
 
-Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
\ No newline at end of file
+Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
diff --git a/appengine/images/api/app.yaml b/appengine/standard/images/api/app.yaml
similarity index 100%
rename from appengine/images/api/app.yaml
rename to appengine/standard/images/api/app.yaml
diff --git a/appengine/images/api/blobstore.py b/appengine/standard/images/api/blobstore.py
similarity index 100%
rename from appengine/images/api/blobstore.py
rename to appengine/standard/images/api/blobstore.py
diff --git a/appengine/images/api/blobstore_test.py b/appengine/standard/images/api/blobstore_test.py
similarity index 100%
rename from appengine/images/api/blobstore_test.py
rename to appengine/standard/images/api/blobstore_test.py
diff --git a/appengine/images/api/favicon.ico b/appengine/standard/images/api/favicon.ico
similarity index 100%
rename from appengine/images/api/favicon.ico
rename to appengine/standard/images/api/favicon.ico
diff --git a/appengine/images/api/main.py b/appengine/standard/images/api/main.py
similarity index 100%
rename from appengine/images/api/main.py
rename to appengine/standard/images/api/main.py
diff --git a/appengine/images/api/main_test.py b/appengine/standard/images/api/main_test.py
similarity index 100%
rename from appengine/images/api/main_test.py
rename to appengine/standard/images/api/main_test.py
diff --git a/appengine/images/guestbook/README.md b/appengine/standard/images/guestbook/README.md
similarity index 89%
rename from appengine/images/guestbook/README.md
rename to appengine/standard/images/guestbook/README.md
index e5deab29873..99154fab7e7 100644
--- a/appengine/images/guestbook/README.md
+++ b/appengine/standard/images/guestbook/README.md
@@ -10,4 +10,4 @@ These samples are used on the following documentation page:
 
 <!-- end-auto-doc-link -->
 
-Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
\ No newline at end of file
+Refer to the [App Engine Samples README](../../README.md) for information on how to run and deploy this sample.
diff --git a/appengine/images/guestbook/app.yaml b/appengine/standard/images/guestbook/app.yaml
similarity index 100%
rename from appengine/images/guestbook/app.yaml
rename to appengine/standard/images/guestbook/app.yaml
diff --git a/appengine/images/guestbook/favicon.ico b/appengine/standard/images/guestbook/favicon.ico
similarity index 100%
rename from appengine/images/guestbook/favicon.ico
rename to appengine/standard/images/guestbook/favicon.ico
diff --git a/appengine/images/guestbook/index.yaml b/appengine/standard/images/guestbook/index.yaml
similarity index 100%
rename from appengine/images/guestbook/index.yaml
rename to appengine/standard/images/guestbook/index.yaml
diff --git a/appengine/images/guestbook/main.py b/appengine/standard/images/guestbook/main.py
similarity index 100%
rename from appengine/images/guestbook/main.py
rename to appengine/standard/images/guestbook/main.py
diff --git a/appengine/images/guestbook/main_test.py b/appengine/standard/images/guestbook/main_test.py
similarity index 100%
rename from appengine/images/guestbook/main_test.py
rename to appengine/standard/images/guestbook/main_test.py
diff --git a/appengine/localtesting/README.md b/appengine/standard/localtesting/README.md
similarity index 100%
rename from appengine/localtesting/README.md
rename to appengine/standard/localtesting/README.md
diff --git a/appengine/localtesting/datastore_test.py b/appengine/standard/localtesting/datastore_test.py
similarity index 100%
rename from appengine/localtesting/datastore_test.py
rename to appengine/standard/localtesting/datastore_test.py
diff --git a/appengine/localtesting/env_vars_test.py b/appengine/standard/localtesting/env_vars_test.py
similarity index 100%
rename from appengine/localtesting/env_vars_test.py
rename to appengine/standard/localtesting/env_vars_test.py
diff --git a/appengine/localtesting/login_test.py b/appengine/standard/localtesting/login_test.py
similarity index 100%
rename from appengine/localtesting/login_test.py
rename to appengine/standard/localtesting/login_test.py
diff --git a/appengine/localtesting/mail_test.py b/appengine/standard/localtesting/mail_test.py
similarity index 100%
rename from appengine/localtesting/mail_test.py
rename to appengine/standard/localtesting/mail_test.py
diff --git a/appengine/localtesting/queue.yaml b/appengine/standard/localtesting/queue.yaml
similarity index 100%
rename from appengine/localtesting/queue.yaml
rename to appengine/standard/localtesting/queue.yaml
diff --git a/appengine/localtesting/resources/queue.yaml b/appengine/standard/localtesting/resources/queue.yaml
similarity index 100%
rename from appengine/localtesting/resources/queue.yaml
rename to appengine/standard/localtesting/resources/queue.yaml
diff --git a/appengine/localtesting/runner.py b/appengine/standard/localtesting/runner.py
similarity index 100%
rename from appengine/localtesting/runner.py
rename to appengine/standard/localtesting/runner.py
diff --git a/appengine/localtesting/task_queue_test.py b/appengine/standard/localtesting/task_queue_test.py
similarity index 100%
rename from appengine/localtesting/task_queue_test.py
rename to appengine/standard/localtesting/task_queue_test.py
diff --git a/appengine/logging/reading_logs/app.yaml b/appengine/standard/logging/reading_logs/app.yaml
similarity index 100%
rename from appengine/logging/reading_logs/app.yaml
rename to appengine/standard/logging/reading_logs/app.yaml
diff --git a/appengine/logging/reading_logs/main.py b/appengine/standard/logging/reading_logs/main.py
similarity index 100%
rename from appengine/logging/reading_logs/main.py
rename to appengine/standard/logging/reading_logs/main.py
diff --git a/appengine/logging/reading_logs/main_test.py b/appengine/standard/logging/reading_logs/main_test.py
similarity index 100%
rename from appengine/logging/reading_logs/main_test.py
rename to appengine/standard/logging/reading_logs/main_test.py
diff --git a/appengine/logging/writing_logs/app.yaml b/appengine/standard/logging/writing_logs/app.yaml
similarity index 100%
rename from appengine/logging/writing_logs/app.yaml
rename to appengine/standard/logging/writing_logs/app.yaml
diff --git a/appengine/logging/writing_logs/main.py b/appengine/standard/logging/writing_logs/main.py
similarity index 100%
rename from appengine/logging/writing_logs/main.py
rename to appengine/standard/logging/writing_logs/main.py
diff --git a/appengine/logging/writing_logs/main_test.py b/appengine/standard/logging/writing_logs/main_test.py
similarity index 100%
rename from appengine/logging/writing_logs/main_test.py
rename to appengine/standard/logging/writing_logs/main_test.py
diff --git a/appengine/mail/README.md b/appengine/standard/mail/README.md
similarity index 100%
rename from appengine/mail/README.md
rename to appengine/standard/mail/README.md
diff --git a/appengine/mail/app.yaml b/appengine/standard/mail/app.yaml
similarity index 100%
rename from appengine/mail/app.yaml
rename to appengine/standard/mail/app.yaml
diff --git a/appengine/mail/attachment.py b/appengine/standard/mail/attachment.py
similarity index 100%
rename from appengine/mail/attachment.py
rename to appengine/standard/mail/attachment.py
diff --git a/appengine/mail/attachment_test.py b/appengine/standard/mail/attachment_test.py
similarity index 100%
rename from appengine/mail/attachment_test.py
rename to appengine/standard/mail/attachment_test.py
diff --git a/appengine/mail/handle_bounced_email.py b/appengine/standard/mail/handle_bounced_email.py
similarity index 100%
rename from appengine/mail/handle_bounced_email.py
rename to appengine/standard/mail/handle_bounced_email.py
diff --git a/appengine/mail/handle_bounced_email_test.py b/appengine/standard/mail/handle_bounced_email_test.py
similarity index 100%
rename from appengine/mail/handle_bounced_email_test.py
rename to appengine/standard/mail/handle_bounced_email_test.py
diff --git a/appengine/mail/handle_incoming_email.py b/appengine/standard/mail/handle_incoming_email.py
similarity index 100%
rename from appengine/mail/handle_incoming_email.py
rename to appengine/standard/mail/handle_incoming_email.py
diff --git a/appengine/mail/handle_incoming_email_test.py b/appengine/standard/mail/handle_incoming_email_test.py
similarity index 100%
rename from appengine/mail/handle_incoming_email_test.py
rename to appengine/standard/mail/handle_incoming_email_test.py
diff --git a/appengine/mail/header.py b/appengine/standard/mail/header.py
similarity index 100%
rename from appengine/mail/header.py
rename to appengine/standard/mail/header.py
diff --git a/appengine/mail/header_test.py b/appengine/standard/mail/header_test.py
similarity index 100%
rename from appengine/mail/header_test.py
rename to appengine/standard/mail/header_test.py
diff --git a/appengine/mail/index.html b/appengine/standard/mail/index.html
similarity index 100%
rename from appengine/mail/index.html
rename to appengine/standard/mail/index.html
diff --git a/appengine/mail/send_mail.py b/appengine/standard/mail/send_mail.py
similarity index 100%
rename from appengine/mail/send_mail.py
rename to appengine/standard/mail/send_mail.py
diff --git a/appengine/mail/send_mail_test.py b/appengine/standard/mail/send_mail_test.py
similarity index 100%
rename from appengine/mail/send_mail_test.py
rename to appengine/standard/mail/send_mail_test.py
diff --git a/appengine/mail/send_message.py b/appengine/standard/mail/send_message.py
similarity index 100%
rename from appengine/mail/send_message.py
rename to appengine/standard/mail/send_message.py
diff --git a/appengine/mail/send_message_test.py b/appengine/standard/mail/send_message_test.py
similarity index 100%
rename from appengine/mail/send_message_test.py
rename to appengine/standard/mail/send_message_test.py
diff --git a/appengine/mail/user_signup.py b/appengine/standard/mail/user_signup.py
similarity index 100%
rename from appengine/mail/user_signup.py
rename to appengine/standard/mail/user_signup.py
diff --git a/appengine/mail/user_signup_test.py b/appengine/standard/mail/user_signup_test.py
similarity index 100%
rename from appengine/mail/user_signup_test.py
rename to appengine/standard/mail/user_signup_test.py
diff --git a/appengine/mailgun/.gitignore b/appengine/standard/mailgun/.gitignore
similarity index 100%
rename from appengine/mailgun/.gitignore
rename to appengine/standard/mailgun/.gitignore
diff --git a/appengine/mailgun/README.md b/appengine/standard/mailgun/README.md
similarity index 100%
rename from appengine/mailgun/README.md
rename to appengine/standard/mailgun/README.md
diff --git a/appengine/mailgun/app.yaml b/appengine/standard/mailgun/app.yaml
similarity index 100%
rename from appengine/mailgun/app.yaml
rename to appengine/standard/mailgun/app.yaml
diff --git a/appengine/mailgun/appengine_config.py b/appengine/standard/mailgun/appengine_config.py
similarity index 100%
rename from appengine/mailgun/appengine_config.py
rename to appengine/standard/mailgun/appengine_config.py
diff --git a/appengine/mailgun/main.py b/appengine/standard/mailgun/main.py
similarity index 100%
rename from appengine/mailgun/main.py
rename to appengine/standard/mailgun/main.py
diff --git a/appengine/mailgun/main_test.py b/appengine/standard/mailgun/main_test.py
similarity index 100%
rename from appengine/mailgun/main_test.py
rename to appengine/standard/mailgun/main_test.py
diff --git a/appengine/mailgun/requirements.txt b/appengine/standard/mailgun/requirements.txt
similarity index 100%
rename from appengine/mailgun/requirements.txt
rename to appengine/standard/mailgun/requirements.txt
diff --git a/appengine/mailjet/.gitignore b/appengine/standard/mailjet/.gitignore
similarity index 100%
rename from appengine/mailjet/.gitignore
rename to appengine/standard/mailjet/.gitignore
diff --git a/appengine/mailjet/README.md b/appengine/standard/mailjet/README.md
similarity index 100%
rename from appengine/mailjet/README.md
rename to appengine/standard/mailjet/README.md
diff --git a/appengine/mailjet/app.yaml b/appengine/standard/mailjet/app.yaml
similarity index 100%
rename from appengine/mailjet/app.yaml
rename to appengine/standard/mailjet/app.yaml
diff --git a/appengine/mailjet/appengine_config.py b/appengine/standard/mailjet/appengine_config.py
similarity index 100%
rename from appengine/mailjet/appengine_config.py
rename to appengine/standard/mailjet/appengine_config.py
diff --git a/appengine/mailjet/main.py b/appengine/standard/mailjet/main.py
similarity index 100%
rename from appengine/mailjet/main.py
rename to appengine/standard/mailjet/main.py
diff --git a/managed_vms/mailjet/main_test.py b/appengine/standard/mailjet/main_test.py
similarity index 100%
rename from managed_vms/mailjet/main_test.py
rename to appengine/standard/mailjet/main_test.py
diff --git a/appengine/mailjet/requirements.txt b/appengine/standard/mailjet/requirements.txt
similarity index 100%
rename from appengine/mailjet/requirements.txt
rename to appengine/standard/mailjet/requirements.txt
diff --git a/appengine/mailjet/templates/index.html b/appengine/standard/mailjet/templates/index.html
similarity index 100%
rename from appengine/mailjet/templates/index.html
rename to appengine/standard/mailjet/templates/index.html
diff --git a/appengine/memcache/best_practices/README.md b/appengine/standard/memcache/best_practices/README.md
similarity index 100%
rename from appengine/memcache/best_practices/README.md
rename to appengine/standard/memcache/best_practices/README.md
diff --git a/appengine/memcache/best_practices/batch/app.yaml b/appengine/standard/memcache/best_practices/batch/app.yaml
similarity index 100%
rename from appengine/memcache/best_practices/batch/app.yaml
rename to appengine/standard/memcache/best_practices/batch/app.yaml
diff --git a/appengine/memcache/best_practices/batch/batch.py b/appengine/standard/memcache/best_practices/batch/batch.py
similarity index 100%
rename from appengine/memcache/best_practices/batch/batch.py
rename to appengine/standard/memcache/best_practices/batch/batch.py
diff --git a/appengine/memcache/best_practices/batch/batch_test.py b/appengine/standard/memcache/best_practices/batch/batch_test.py
similarity index 100%
rename from appengine/memcache/best_practices/batch/batch_test.py
rename to appengine/standard/memcache/best_practices/batch/batch_test.py
diff --git a/appengine/memcache/best_practices/failure/app.yaml b/appengine/standard/memcache/best_practices/failure/app.yaml
similarity index 100%
rename from appengine/memcache/best_practices/failure/app.yaml
rename to appengine/standard/memcache/best_practices/failure/app.yaml
diff --git a/appengine/memcache/best_practices/failure/failure.py b/appengine/standard/memcache/best_practices/failure/failure.py
similarity index 100%
rename from appengine/memcache/best_practices/failure/failure.py
rename to appengine/standard/memcache/best_practices/failure/failure.py
diff --git a/appengine/memcache/best_practices/failure/failure_test.py b/appengine/standard/memcache/best_practices/failure/failure_test.py
similarity index 100%
rename from appengine/memcache/best_practices/failure/failure_test.py
rename to appengine/standard/memcache/best_practices/failure/failure_test.py
diff --git a/appengine/memcache/best_practices/migration_step1/app.yaml b/appengine/standard/memcache/best_practices/migration_step1/app.yaml
similarity index 100%
rename from appengine/memcache/best_practices/migration_step1/app.yaml
rename to appengine/standard/memcache/best_practices/migration_step1/app.yaml
diff --git a/appengine/memcache/best_practices/migration_step1/migration1.py b/appengine/standard/memcache/best_practices/migration_step1/migration1.py
similarity index 100%
rename from appengine/memcache/best_practices/migration_step1/migration1.py
rename to appengine/standard/memcache/best_practices/migration_step1/migration1.py
diff --git a/appengine/memcache/best_practices/migration_step1/migration1_test.py b/appengine/standard/memcache/best_practices/migration_step1/migration1_test.py
similarity index 100%
rename from appengine/memcache/best_practices/migration_step1/migration1_test.py
rename to appengine/standard/memcache/best_practices/migration_step1/migration1_test.py
diff --git a/appengine/memcache/best_practices/migration_step2/app.yaml b/appengine/standard/memcache/best_practices/migration_step2/app.yaml
similarity index 100%
rename from appengine/memcache/best_practices/migration_step2/app.yaml
rename to appengine/standard/memcache/best_practices/migration_step2/app.yaml
diff --git a/appengine/memcache/best_practices/migration_step2/migration2.py b/appengine/standard/memcache/best_practices/migration_step2/migration2.py
similarity index 100%
rename from appengine/memcache/best_practices/migration_step2/migration2.py
rename to appengine/standard/memcache/best_practices/migration_step2/migration2.py
diff --git a/appengine/memcache/best_practices/migration_step2/migration2_test.py b/appengine/standard/memcache/best_practices/migration_step2/migration2_test.py
similarity index 100%
rename from appengine/memcache/best_practices/migration_step2/migration2_test.py
rename to appengine/standard/memcache/best_practices/migration_step2/migration2_test.py
diff --git a/appengine/memcache/best_practices/sharing/app.yaml b/appengine/standard/memcache/best_practices/sharing/app.yaml
similarity index 100%
rename from appengine/memcache/best_practices/sharing/app.yaml
rename to appengine/standard/memcache/best_practices/sharing/app.yaml
diff --git a/appengine/memcache/best_practices/sharing/sharing.py b/appengine/standard/memcache/best_practices/sharing/sharing.py
similarity index 100%
rename from appengine/memcache/best_practices/sharing/sharing.py
rename to appengine/standard/memcache/best_practices/sharing/sharing.py
diff --git a/appengine/memcache/best_practices/sharing/sharing_test.py b/appengine/standard/memcache/best_practices/sharing/sharing_test.py
similarity index 100%
rename from appengine/memcache/best_practices/sharing/sharing_test.py
rename to appengine/standard/memcache/best_practices/sharing/sharing_test.py
diff --git a/appengine/memcache/guestbook/README.md b/appengine/standard/memcache/guestbook/README.md
similarity index 100%
rename from appengine/memcache/guestbook/README.md
rename to appengine/standard/memcache/guestbook/README.md
diff --git a/appengine/memcache/guestbook/app.yaml b/appengine/standard/memcache/guestbook/app.yaml
similarity index 100%
rename from appengine/memcache/guestbook/app.yaml
rename to appengine/standard/memcache/guestbook/app.yaml
diff --git a/appengine/memcache/guestbook/favicon.ico b/appengine/standard/memcache/guestbook/favicon.ico
similarity index 100%
rename from appengine/memcache/guestbook/favicon.ico
rename to appengine/standard/memcache/guestbook/favicon.ico
diff --git a/appengine/memcache/guestbook/index.yaml b/appengine/standard/memcache/guestbook/index.yaml
similarity index 100%
rename from appengine/memcache/guestbook/index.yaml
rename to appengine/standard/memcache/guestbook/index.yaml
diff --git a/appengine/memcache/guestbook/main.py b/appengine/standard/memcache/guestbook/main.py
similarity index 100%
rename from appengine/memcache/guestbook/main.py
rename to appengine/standard/memcache/guestbook/main.py
diff --git a/appengine/memcache/guestbook/main_test.py b/appengine/standard/memcache/guestbook/main_test.py
similarity index 100%
rename from appengine/memcache/guestbook/main_test.py
rename to appengine/standard/memcache/guestbook/main_test.py
diff --git a/appengine/memcache/snippets/snippets.py b/appengine/standard/memcache/snippets/snippets.py
similarity index 100%
rename from appengine/memcache/snippets/snippets.py
rename to appengine/standard/memcache/snippets/snippets.py
diff --git a/appengine/memcache/snippets/snippets_test.py b/appengine/standard/memcache/snippets/snippets_test.py
similarity index 100%
rename from appengine/memcache/snippets/snippets_test.py
rename to appengine/standard/memcache/snippets/snippets_test.py
diff --git a/appengine/modules/README.md b/appengine/standard/modules/README.md
similarity index 100%
rename from appengine/modules/README.md
rename to appengine/standard/modules/README.md
diff --git a/appengine/modules/app.yaml b/appengine/standard/modules/app.yaml
similarity index 100%
rename from appengine/modules/app.yaml
rename to appengine/standard/modules/app.yaml
diff --git a/appengine/modules/backend.py b/appengine/standard/modules/backend.py
similarity index 100%
rename from appengine/modules/backend.py
rename to appengine/standard/modules/backend.py
diff --git a/appengine/modules/backend.yaml b/appengine/standard/modules/backend.yaml
similarity index 100%
rename from appengine/modules/backend.yaml
rename to appengine/standard/modules/backend.yaml
diff --git a/appengine/modules/backend_test.py b/appengine/standard/modules/backend_test.py
similarity index 100%
rename from appengine/modules/backend_test.py
rename to appengine/standard/modules/backend_test.py
diff --git a/appengine/modules/main.py b/appengine/standard/modules/main.py
similarity index 100%
rename from appengine/modules/main.py
rename to appengine/standard/modules/main.py
diff --git a/appengine/modules/main_test.py b/appengine/standard/modules/main_test.py
similarity index 100%
rename from appengine/modules/main_test.py
rename to appengine/standard/modules/main_test.py
diff --git a/appengine/multitenancy/README.md b/appengine/standard/multitenancy/README.md
similarity index 100%
rename from appengine/multitenancy/README.md
rename to appengine/standard/multitenancy/README.md
diff --git a/appengine/multitenancy/app.yaml b/appengine/standard/multitenancy/app.yaml
similarity index 100%
rename from appengine/multitenancy/app.yaml
rename to appengine/standard/multitenancy/app.yaml
diff --git a/appengine/multitenancy/datastore.py b/appengine/standard/multitenancy/datastore.py
similarity index 100%
rename from appengine/multitenancy/datastore.py
rename to appengine/standard/multitenancy/datastore.py
diff --git a/appengine/multitenancy/datastore_test.py b/appengine/standard/multitenancy/datastore_test.py
similarity index 100%
rename from appengine/multitenancy/datastore_test.py
rename to appengine/standard/multitenancy/datastore_test.py
diff --git a/appengine/multitenancy/memcache.py b/appengine/standard/multitenancy/memcache.py
similarity index 100%
rename from appengine/multitenancy/memcache.py
rename to appengine/standard/multitenancy/memcache.py
diff --git a/appengine/multitenancy/memcache_test.py b/appengine/standard/multitenancy/memcache_test.py
similarity index 100%
rename from appengine/multitenancy/memcache_test.py
rename to appengine/standard/multitenancy/memcache_test.py
diff --git a/appengine/multitenancy/taskqueue.py b/appengine/standard/multitenancy/taskqueue.py
similarity index 100%
rename from appengine/multitenancy/taskqueue.py
rename to appengine/standard/multitenancy/taskqueue.py
diff --git a/appengine/multitenancy/taskqueue_test.py b/appengine/standard/multitenancy/taskqueue_test.py
similarity index 100%
rename from appengine/multitenancy/taskqueue_test.py
rename to appengine/standard/multitenancy/taskqueue_test.py
diff --git a/appengine/ndb/async/README.md b/appengine/standard/ndb/async/README.md
similarity index 100%
rename from appengine/ndb/async/README.md
rename to appengine/standard/ndb/async/README.md
diff --git a/appengine/ndb/async/app_async.py b/appengine/standard/ndb/async/app_async.py
similarity index 100%
rename from appengine/ndb/async/app_async.py
rename to appengine/standard/ndb/async/app_async.py
diff --git a/appengine/ndb/async/app_async_test.py b/appengine/standard/ndb/async/app_async_test.py
similarity index 100%
rename from appengine/ndb/async/app_async_test.py
rename to appengine/standard/ndb/async/app_async_test.py
diff --git a/appengine/ndb/async/app_sync.py b/appengine/standard/ndb/async/app_sync.py
similarity index 100%
rename from appengine/ndb/async/app_sync.py
rename to appengine/standard/ndb/async/app_sync.py
diff --git a/appengine/ndb/async/app_sync_test.py b/appengine/standard/ndb/async/app_sync_test.py
similarity index 100%
rename from appengine/ndb/async/app_sync_test.py
rename to appengine/standard/ndb/async/app_sync_test.py
diff --git a/appengine/ndb/async/app_toplevel/README.md b/appengine/standard/ndb/async/app_toplevel/README.md
similarity index 100%
rename from appengine/ndb/async/app_toplevel/README.md
rename to appengine/standard/ndb/async/app_toplevel/README.md
diff --git a/appengine/ndb/async/app_toplevel/app_toplevel.py b/appengine/standard/ndb/async/app_toplevel/app_toplevel.py
similarity index 100%
rename from appengine/ndb/async/app_toplevel/app_toplevel.py
rename to appengine/standard/ndb/async/app_toplevel/app_toplevel.py
diff --git a/appengine/ndb/async/app_toplevel/app_toplevel_test.py b/appengine/standard/ndb/async/app_toplevel/app_toplevel_test.py
similarity index 100%
rename from appengine/ndb/async/app_toplevel/app_toplevel_test.py
rename to appengine/standard/ndb/async/app_toplevel/app_toplevel_test.py
diff --git a/appengine/ndb/async/app_toplevel/index.html b/appengine/standard/ndb/async/app_toplevel/index.html
similarity index 100%
rename from appengine/ndb/async/app_toplevel/index.html
rename to appengine/standard/ndb/async/app_toplevel/index.html
diff --git a/appengine/ndb/async/guestbook.py b/appengine/standard/ndb/async/guestbook.py
similarity index 100%
rename from appengine/ndb/async/guestbook.py
rename to appengine/standard/ndb/async/guestbook.py
diff --git a/appengine/ndb/async/guestbook_test.py b/appengine/standard/ndb/async/guestbook_test.py
similarity index 100%
rename from appengine/ndb/async/guestbook_test.py
rename to appengine/standard/ndb/async/guestbook_test.py
diff --git a/appengine/ndb/async/shopping_cart.py b/appengine/standard/ndb/async/shopping_cart.py
similarity index 100%
rename from appengine/ndb/async/shopping_cart.py
rename to appengine/standard/ndb/async/shopping_cart.py
diff --git a/appengine/ndb/async/shopping_cart_test.py b/appengine/standard/ndb/async/shopping_cart_test.py
similarity index 100%
rename from appengine/ndb/async/shopping_cart_test.py
rename to appengine/standard/ndb/async/shopping_cart_test.py
diff --git a/appengine/ndb/cache/README.md b/appengine/standard/ndb/cache/README.md
similarity index 100%
rename from appengine/ndb/cache/README.md
rename to appengine/standard/ndb/cache/README.md
diff --git a/appengine/ndb/cache/snippets.py b/appengine/standard/ndb/cache/snippets.py
similarity index 100%
rename from appengine/ndb/cache/snippets.py
rename to appengine/standard/ndb/cache/snippets.py
diff --git a/appengine/ndb/cache/snippets_test.py b/appengine/standard/ndb/cache/snippets_test.py
similarity index 100%
rename from appengine/ndb/cache/snippets_test.py
rename to appengine/standard/ndb/cache/snippets_test.py
diff --git a/appengine/ndb/entities/README.md b/appengine/standard/ndb/entities/README.md
similarity index 100%
rename from appengine/ndb/entities/README.md
rename to appengine/standard/ndb/entities/README.md
diff --git a/appengine/ndb/entities/snippets.py b/appengine/standard/ndb/entities/snippets.py
similarity index 100%
rename from appengine/ndb/entities/snippets.py
rename to appengine/standard/ndb/entities/snippets.py
diff --git a/appengine/ndb/entities/snippets_test.py b/appengine/standard/ndb/entities/snippets_test.py
similarity index 100%
rename from appengine/ndb/entities/snippets_test.py
rename to appengine/standard/ndb/entities/snippets_test.py
diff --git a/appengine/ndb/modeling/README.md b/appengine/standard/ndb/modeling/README.md
similarity index 100%
rename from appengine/ndb/modeling/README.md
rename to appengine/standard/ndb/modeling/README.md
diff --git a/appengine/ndb/modeling/contact_with_group_models.py b/appengine/standard/ndb/modeling/contact_with_group_models.py
similarity index 100%
rename from appengine/ndb/modeling/contact_with_group_models.py
rename to appengine/standard/ndb/modeling/contact_with_group_models.py
diff --git a/appengine/ndb/modeling/contact_with_group_models_test.py b/appengine/standard/ndb/modeling/contact_with_group_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/contact_with_group_models_test.py
rename to appengine/standard/ndb/modeling/contact_with_group_models_test.py
diff --git a/appengine/ndb/modeling/keyproperty_models.py b/appengine/standard/ndb/modeling/keyproperty_models.py
similarity index 100%
rename from appengine/ndb/modeling/keyproperty_models.py
rename to appengine/standard/ndb/modeling/keyproperty_models.py
diff --git a/appengine/ndb/modeling/keyproperty_models_test.py b/appengine/standard/ndb/modeling/keyproperty_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/keyproperty_models_test.py
rename to appengine/standard/ndb/modeling/keyproperty_models_test.py
diff --git a/appengine/ndb/modeling/naive_models.py b/appengine/standard/ndb/modeling/naive_models.py
similarity index 100%
rename from appengine/ndb/modeling/naive_models.py
rename to appengine/standard/ndb/modeling/naive_models.py
diff --git a/appengine/ndb/modeling/naive_models_test.py b/appengine/standard/ndb/modeling/naive_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/naive_models_test.py
rename to appengine/standard/ndb/modeling/naive_models_test.py
diff --git a/appengine/ndb/modeling/parent_child_models.py b/appengine/standard/ndb/modeling/parent_child_models.py
similarity index 100%
rename from appengine/ndb/modeling/parent_child_models.py
rename to appengine/standard/ndb/modeling/parent_child_models.py
diff --git a/appengine/ndb/modeling/parent_child_models_test.py b/appengine/standard/ndb/modeling/parent_child_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/parent_child_models_test.py
rename to appengine/standard/ndb/modeling/parent_child_models_test.py
diff --git a/appengine/ndb/modeling/relation_model_models.py b/appengine/standard/ndb/modeling/relation_model_models.py
similarity index 100%
rename from appengine/ndb/modeling/relation_model_models.py
rename to appengine/standard/ndb/modeling/relation_model_models.py
diff --git a/appengine/ndb/modeling/relation_model_models_test.py b/appengine/standard/ndb/modeling/relation_model_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/relation_model_models_test.py
rename to appengine/standard/ndb/modeling/relation_model_models_test.py
diff --git a/appengine/ndb/modeling/structured_property_models.py b/appengine/standard/ndb/modeling/structured_property_models.py
similarity index 100%
rename from appengine/ndb/modeling/structured_property_models.py
rename to appengine/standard/ndb/modeling/structured_property_models.py
diff --git a/appengine/ndb/modeling/structured_property_models_test.py b/appengine/standard/ndb/modeling/structured_property_models_test.py
similarity index 100%
rename from appengine/ndb/modeling/structured_property_models_test.py
rename to appengine/standard/ndb/modeling/structured_property_models_test.py
diff --git a/appengine/ndb/overview/README.md b/appengine/standard/ndb/overview/README.md
similarity index 100%
rename from appengine/ndb/overview/README.md
rename to appengine/standard/ndb/overview/README.md
diff --git a/appengine/ndb/overview/app.yaml b/appengine/standard/ndb/overview/app.yaml
similarity index 100%
rename from appengine/ndb/overview/app.yaml
rename to appengine/standard/ndb/overview/app.yaml
diff --git a/appengine/ndb/overview/favicon.ico b/appengine/standard/ndb/overview/favicon.ico
similarity index 100%
rename from appengine/ndb/overview/favicon.ico
rename to appengine/standard/ndb/overview/favicon.ico
diff --git a/appengine/ndb/overview/index.yaml b/appengine/standard/ndb/overview/index.yaml
similarity index 100%
rename from appengine/ndb/overview/index.yaml
rename to appengine/standard/ndb/overview/index.yaml
diff --git a/appengine/ndb/overview/main.py b/appengine/standard/ndb/overview/main.py
similarity index 100%
rename from appengine/ndb/overview/main.py
rename to appengine/standard/ndb/overview/main.py
diff --git a/appengine/ndb/overview/main_test.py b/appengine/standard/ndb/overview/main_test.py
similarity index 100%
rename from appengine/ndb/overview/main_test.py
rename to appengine/standard/ndb/overview/main_test.py
diff --git a/appengine/ndb/projection_queries/README.md b/appengine/standard/ndb/projection_queries/README.md
similarity index 100%
rename from appengine/ndb/projection_queries/README.md
rename to appengine/standard/ndb/projection_queries/README.md
diff --git a/appengine/ndb/projection_queries/snippets.py b/appengine/standard/ndb/projection_queries/snippets.py
similarity index 100%
rename from appengine/ndb/projection_queries/snippets.py
rename to appengine/standard/ndb/projection_queries/snippets.py
diff --git a/appengine/ndb/projection_queries/snippets_test.py b/appengine/standard/ndb/projection_queries/snippets_test.py
similarity index 100%
rename from appengine/ndb/projection_queries/snippets_test.py
rename to appengine/standard/ndb/projection_queries/snippets_test.py
diff --git a/appengine/ndb/properties/README.md b/appengine/standard/ndb/properties/README.md
similarity index 100%
rename from appengine/ndb/properties/README.md
rename to appengine/standard/ndb/properties/README.md
diff --git a/appengine/ndb/properties/snippets.py b/appengine/standard/ndb/properties/snippets.py
similarity index 100%
rename from appengine/ndb/properties/snippets.py
rename to appengine/standard/ndb/properties/snippets.py
diff --git a/appengine/ndb/properties/snippets_test.py b/appengine/standard/ndb/properties/snippets_test.py
similarity index 100%
rename from appengine/ndb/properties/snippets_test.py
rename to appengine/standard/ndb/properties/snippets_test.py
diff --git a/appengine/ndb/property_subclasses/README.md b/appengine/standard/ndb/property_subclasses/README.md
similarity index 100%
rename from appengine/ndb/property_subclasses/README.md
rename to appengine/standard/ndb/property_subclasses/README.md
diff --git a/appengine/ndb/property_subclasses/my_models.py b/appengine/standard/ndb/property_subclasses/my_models.py
similarity index 100%
rename from appengine/ndb/property_subclasses/my_models.py
rename to appengine/standard/ndb/property_subclasses/my_models.py
diff --git a/appengine/ndb/property_subclasses/snippets.py b/appengine/standard/ndb/property_subclasses/snippets.py
similarity index 100%
rename from appengine/ndb/property_subclasses/snippets.py
rename to appengine/standard/ndb/property_subclasses/snippets.py
diff --git a/appengine/ndb/property_subclasses/snippets_test.py b/appengine/standard/ndb/property_subclasses/snippets_test.py
similarity index 100%
rename from appengine/ndb/property_subclasses/snippets_test.py
rename to appengine/standard/ndb/property_subclasses/snippets_test.py
diff --git a/appengine/ndb/queries/README.md b/appengine/standard/ndb/queries/README.md
similarity index 100%
rename from appengine/ndb/queries/README.md
rename to appengine/standard/ndb/queries/README.md
diff --git a/appengine/ndb/queries/guestbook.py b/appengine/standard/ndb/queries/guestbook.py
similarity index 100%
rename from appengine/ndb/queries/guestbook.py
rename to appengine/standard/ndb/queries/guestbook.py
diff --git a/appengine/ndb/queries/guestbook_test.py b/appengine/standard/ndb/queries/guestbook_test.py
similarity index 100%
rename from appengine/ndb/queries/guestbook_test.py
rename to appengine/standard/ndb/queries/guestbook_test.py
diff --git a/appengine/ndb/queries/snippets.py b/appengine/standard/ndb/queries/snippets.py
similarity index 100%
rename from appengine/ndb/queries/snippets.py
rename to appengine/standard/ndb/queries/snippets.py
diff --git a/appengine/ndb/queries/snippets_models.py b/appengine/standard/ndb/queries/snippets_models.py
similarity index 100%
rename from appengine/ndb/queries/snippets_models.py
rename to appengine/standard/ndb/queries/snippets_models.py
diff --git a/appengine/ndb/queries/snippets_test.py b/appengine/standard/ndb/queries/snippets_test.py
similarity index 100%
rename from appengine/ndb/queries/snippets_test.py
rename to appengine/standard/ndb/queries/snippets_test.py
diff --git a/appengine/ndb/transactions/README.md b/appengine/standard/ndb/transactions/README.md
similarity index 100%
rename from appengine/ndb/transactions/README.md
rename to appengine/standard/ndb/transactions/README.md
diff --git a/appengine/ndb/transactions/app.yaml b/appengine/standard/ndb/transactions/app.yaml
similarity index 100%
rename from appengine/ndb/transactions/app.yaml
rename to appengine/standard/ndb/transactions/app.yaml
diff --git a/appengine/ndb/transactions/appengine_config.py b/appengine/standard/ndb/transactions/appengine_config.py
similarity index 100%
rename from appengine/ndb/transactions/appengine_config.py
rename to appengine/standard/ndb/transactions/appengine_config.py
diff --git a/appengine/ndb/transactions/favicon.ico b/appengine/standard/ndb/transactions/favicon.ico
similarity index 100%
rename from appengine/ndb/transactions/favicon.ico
rename to appengine/standard/ndb/transactions/favicon.ico
diff --git a/appengine/ndb/transactions/main.py b/appengine/standard/ndb/transactions/main.py
similarity index 100%
rename from appengine/ndb/transactions/main.py
rename to appengine/standard/ndb/transactions/main.py
diff --git a/appengine/ndb/transactions/main_test.py b/appengine/standard/ndb/transactions/main_test.py
similarity index 100%
rename from appengine/ndb/transactions/main_test.py
rename to appengine/standard/ndb/transactions/main_test.py
diff --git a/managed_vms/hello_world_compat/requirements.txt b/appengine/standard/ndb/transactions/requirements.txt
similarity index 100%
rename from managed_vms/hello_world_compat/requirements.txt
rename to appengine/standard/ndb/transactions/requirements.txt
diff --git a/appengine/remote_api/app.yaml b/appengine/standard/remote_api/app.yaml
similarity index 100%
rename from appengine/remote_api/app.yaml
rename to appengine/standard/remote_api/app.yaml
diff --git a/appengine/remote_api/client.py b/appengine/standard/remote_api/client.py
similarity index 100%
rename from appengine/remote_api/client.py
rename to appengine/standard/remote_api/client.py
diff --git a/appengine/requests/README.md b/appengine/standard/requests/README.md
similarity index 100%
rename from appengine/requests/README.md
rename to appengine/standard/requests/README.md
diff --git a/appengine/requests/app.yaml b/appengine/standard/requests/app.yaml
similarity index 100%
rename from appengine/requests/app.yaml
rename to appengine/standard/requests/app.yaml
diff --git a/appengine/requests/main.py b/appengine/standard/requests/main.py
similarity index 100%
rename from appengine/requests/main.py
rename to appengine/standard/requests/main.py
diff --git a/appengine/requests/main_test.py b/appengine/standard/requests/main_test.py
similarity index 100%
rename from appengine/requests/main_test.py
rename to appengine/standard/requests/main_test.py
diff --git a/appengine/resources/app.yaml b/appengine/standard/resources/app.yaml
similarity index 100%
rename from appengine/resources/app.yaml
rename to appengine/standard/resources/app.yaml
diff --git a/appengine/search/snippets/snippets.py b/appengine/standard/search/snippets/snippets.py
similarity index 100%
rename from appengine/search/snippets/snippets.py
rename to appengine/standard/search/snippets/snippets.py
diff --git a/appengine/search/snippets/snippets_test.py b/appengine/standard/search/snippets/snippets_test.py
similarity index 100%
rename from appengine/search/snippets/snippets_test.py
rename to appengine/standard/search/snippets/snippets_test.py
diff --git a/appengine/sendgrid/README.md b/appengine/standard/sendgrid/README.md
similarity index 100%
rename from appengine/sendgrid/README.md
rename to appengine/standard/sendgrid/README.md
diff --git a/appengine/sendgrid/app.yaml b/appengine/standard/sendgrid/app.yaml
similarity index 100%
rename from appengine/sendgrid/app.yaml
rename to appengine/standard/sendgrid/app.yaml
diff --git a/appengine/sendgrid/appengine_config.py b/appengine/standard/sendgrid/appengine_config.py
similarity index 100%
rename from appengine/sendgrid/appengine_config.py
rename to appengine/standard/sendgrid/appengine_config.py
diff --git a/appengine/sendgrid/main.py b/appengine/standard/sendgrid/main.py
similarity index 100%
rename from appengine/sendgrid/main.py
rename to appengine/standard/sendgrid/main.py
diff --git a/appengine/sendgrid/main_test.py b/appengine/standard/sendgrid/main_test.py
similarity index 100%
rename from appengine/sendgrid/main_test.py
rename to appengine/standard/sendgrid/main_test.py
diff --git a/appengine/sendgrid/requirements.txt b/appengine/standard/sendgrid/requirements.txt
similarity index 100%
rename from appengine/sendgrid/requirements.txt
rename to appengine/standard/sendgrid/requirements.txt
diff --git a/appengine/storage/.gitignore b/appengine/standard/storage/.gitignore
similarity index 100%
rename from appengine/storage/.gitignore
rename to appengine/standard/storage/.gitignore
diff --git a/appengine/storage/README.md b/appengine/standard/storage/README.md
similarity index 100%
rename from appengine/storage/README.md
rename to appengine/standard/storage/README.md
diff --git a/appengine/storage/app.yaml b/appengine/standard/storage/app.yaml
similarity index 100%
rename from appengine/storage/app.yaml
rename to appengine/standard/storage/app.yaml
diff --git a/appengine/storage/appengine_config.py b/appengine/standard/storage/appengine_config.py
similarity index 100%
rename from appengine/storage/appengine_config.py
rename to appengine/standard/storage/appengine_config.py
diff --git a/appengine/storage/main.py b/appengine/standard/storage/main.py
similarity index 100%
rename from appengine/storage/main.py
rename to appengine/standard/storage/main.py
diff --git a/appengine/storage/main_test.py b/appengine/standard/storage/main_test.py
similarity index 100%
rename from appengine/storage/main_test.py
rename to appengine/standard/storage/main_test.py
diff --git a/appengine/storage/requirements.txt b/appengine/standard/storage/requirements.txt
similarity index 100%
rename from appengine/storage/requirements.txt
rename to appengine/standard/storage/requirements.txt
diff --git a/appengine/taskqueue/counter/README.md b/appengine/standard/taskqueue/counter/README.md
similarity index 100%
rename from appengine/taskqueue/counter/README.md
rename to appengine/standard/taskqueue/counter/README.md
diff --git a/appengine/taskqueue/counter/application.py b/appengine/standard/taskqueue/counter/application.py
similarity index 100%
rename from appengine/taskqueue/counter/application.py
rename to appengine/standard/taskqueue/counter/application.py
diff --git a/appengine/taskqueue/counter/application.yaml b/appengine/standard/taskqueue/counter/application.yaml
similarity index 100%
rename from appengine/taskqueue/counter/application.yaml
rename to appengine/standard/taskqueue/counter/application.yaml
diff --git a/appengine/taskqueue/counter/application_test.py b/appengine/standard/taskqueue/counter/application_test.py
similarity index 100%
rename from appengine/taskqueue/counter/application_test.py
rename to appengine/standard/taskqueue/counter/application_test.py
diff --git a/appengine/taskqueue/counter/queue.yaml b/appengine/standard/taskqueue/counter/queue.yaml
similarity index 100%
rename from appengine/taskqueue/counter/queue.yaml
rename to appengine/standard/taskqueue/counter/queue.yaml
diff --git a/appengine/taskqueue/counter/worker.py b/appengine/standard/taskqueue/counter/worker.py
similarity index 100%
rename from appengine/taskqueue/counter/worker.py
rename to appengine/standard/taskqueue/counter/worker.py
diff --git a/appengine/taskqueue/counter/worker.yaml b/appengine/standard/taskqueue/counter/worker.yaml
similarity index 100%
rename from appengine/taskqueue/counter/worker.yaml
rename to appengine/standard/taskqueue/counter/worker.yaml
diff --git a/appengine/taskqueue/pull-counter/README.md b/appengine/standard/taskqueue/pull-counter/README.md
similarity index 100%
rename from appengine/taskqueue/pull-counter/README.md
rename to appengine/standard/taskqueue/pull-counter/README.md
diff --git a/appengine/taskqueue/pull-counter/app.yaml b/appengine/standard/taskqueue/pull-counter/app.yaml
similarity index 100%
rename from appengine/taskqueue/pull-counter/app.yaml
rename to appengine/standard/taskqueue/pull-counter/app.yaml
diff --git a/appengine/taskqueue/pull-counter/counter.html b/appengine/standard/taskqueue/pull-counter/counter.html
similarity index 100%
rename from appengine/taskqueue/pull-counter/counter.html
rename to appengine/standard/taskqueue/pull-counter/counter.html
diff --git a/appengine/taskqueue/pull-counter/main.py b/appengine/standard/taskqueue/pull-counter/main.py
similarity index 100%
rename from appengine/taskqueue/pull-counter/main.py
rename to appengine/standard/taskqueue/pull-counter/main.py
diff --git a/appengine/taskqueue/pull-counter/pullcounter_test.py b/appengine/standard/taskqueue/pull-counter/pullcounter_test.py
similarity index 100%
rename from appengine/taskqueue/pull-counter/pullcounter_test.py
rename to appengine/standard/taskqueue/pull-counter/pullcounter_test.py
diff --git a/appengine/taskqueue/pull-counter/queue.yaml b/appengine/standard/taskqueue/pull-counter/queue.yaml
similarity index 100%
rename from appengine/taskqueue/pull-counter/queue.yaml
rename to appengine/standard/taskqueue/pull-counter/queue.yaml
diff --git a/appengine/taskqueue/pull-counter/worker.yaml b/appengine/standard/taskqueue/pull-counter/worker.yaml
similarity index 100%
rename from appengine/taskqueue/pull-counter/worker.yaml
rename to appengine/standard/taskqueue/pull-counter/worker.yaml
diff --git a/appengine/urlfetch/README.md b/appengine/standard/urlfetch/README.md
similarity index 100%
rename from appengine/urlfetch/README.md
rename to appengine/standard/urlfetch/README.md
diff --git a/appengine/urlfetch/async/app.yaml b/appengine/standard/urlfetch/async/app.yaml
similarity index 100%
rename from appengine/urlfetch/async/app.yaml
rename to appengine/standard/urlfetch/async/app.yaml
diff --git a/appengine/urlfetch/async/rpc.py b/appengine/standard/urlfetch/async/rpc.py
similarity index 100%
rename from appengine/urlfetch/async/rpc.py
rename to appengine/standard/urlfetch/async/rpc.py
diff --git a/appengine/urlfetch/async/rpc_test.py b/appengine/standard/urlfetch/async/rpc_test.py
similarity index 100%
rename from appengine/urlfetch/async/rpc_test.py
rename to appengine/standard/urlfetch/async/rpc_test.py
diff --git a/appengine/urlfetch/requests/.gitignore b/appengine/standard/urlfetch/requests/.gitignore
similarity index 100%
rename from appengine/urlfetch/requests/.gitignore
rename to appengine/standard/urlfetch/requests/.gitignore
diff --git a/appengine/urlfetch/requests/app.yaml b/appengine/standard/urlfetch/requests/app.yaml
similarity index 100%
rename from appengine/urlfetch/requests/app.yaml
rename to appengine/standard/urlfetch/requests/app.yaml
diff --git a/appengine/urlfetch/requests/appengine_config.py b/appengine/standard/urlfetch/requests/appengine_config.py
similarity index 100%
rename from appengine/urlfetch/requests/appengine_config.py
rename to appengine/standard/urlfetch/requests/appengine_config.py
diff --git a/appengine/urlfetch/requests/main.py b/appengine/standard/urlfetch/requests/main.py
similarity index 100%
rename from appengine/urlfetch/requests/main.py
rename to appengine/standard/urlfetch/requests/main.py
diff --git a/appengine/urlfetch/requests/main_test.py b/appengine/standard/urlfetch/requests/main_test.py
similarity index 100%
rename from appengine/urlfetch/requests/main_test.py
rename to appengine/standard/urlfetch/requests/main_test.py
diff --git a/appengine/urlfetch/requests/requirements.txt b/appengine/standard/urlfetch/requests/requirements.txt
similarity index 100%
rename from appengine/urlfetch/requests/requirements.txt
rename to appengine/standard/urlfetch/requests/requirements.txt
diff --git a/appengine/urlfetch/snippets/app.yaml b/appengine/standard/urlfetch/snippets/app.yaml
similarity index 100%
rename from appengine/urlfetch/snippets/app.yaml
rename to appengine/standard/urlfetch/snippets/app.yaml
diff --git a/appengine/urlfetch/snippets/main.py b/appengine/standard/urlfetch/snippets/main.py
similarity index 100%
rename from appengine/urlfetch/snippets/main.py
rename to appengine/standard/urlfetch/snippets/main.py
diff --git a/appengine/urlfetch/snippets/main_test.py b/appengine/standard/urlfetch/snippets/main_test.py
similarity index 100%
rename from appengine/urlfetch/snippets/main_test.py
rename to appengine/standard/urlfetch/snippets/main_test.py
diff --git a/appengine/users/app.yaml b/appengine/standard/users/app.yaml
similarity index 100%
rename from appengine/users/app.yaml
rename to appengine/standard/users/app.yaml
diff --git a/appengine/users/main.py b/appengine/standard/users/main.py
similarity index 100%
rename from appengine/users/main.py
rename to appengine/standard/users/main.py
diff --git a/appengine/users/main_test.py b/appengine/standard/users/main_test.py
similarity index 100%
rename from appengine/users/main_test.py
rename to appengine/standard/users/main_test.py
diff --git a/appengine/xmpp/README.md b/appengine/standard/xmpp/README.md
similarity index 100%
rename from appengine/xmpp/README.md
rename to appengine/standard/xmpp/README.md
diff --git a/appengine/xmpp/app.yaml b/appengine/standard/xmpp/app.yaml
similarity index 100%
rename from appengine/xmpp/app.yaml
rename to appengine/standard/xmpp/app.yaml
diff --git a/appengine/xmpp/xmpp.py b/appengine/standard/xmpp/xmpp.py
similarity index 100%
rename from appengine/xmpp/xmpp.py
rename to appengine/standard/xmpp/xmpp.py
diff --git a/appengine/xmpp/xmpp_test.py b/appengine/standard/xmpp/xmpp_test.py
similarity index 100%
rename from appengine/xmpp/xmpp_test.py
rename to appengine/standard/xmpp/xmpp_test.py
diff --git a/nox.py b/nox.py
index 80632b6102a..46f2abd333d 100644
--- a/nox.py
+++ b/nox.py
@@ -27,7 +27,7 @@
     '.coveragerc', '--cov-append', '--cov-report=']
 
 # Speech is temporarily disabled.
-TESTS_BLACKLIST = set(('appengine', 'testing', 'speech'))
+TESTS_BLACKLIST = set(('./appengine/standard', './testing', './speech'))
 APPENGINE_BLACKLIST = set()
 
 
@@ -50,7 +50,8 @@ def collect_sample_dirs(start_dir, blacklist=set()):
         else:
             # Filter out dirs we don't want to recurse into
             subdirs[:] = [s for s in subdirs
-                          if s[0].isalpha() and s not in blacklist]
+                          if s[0].isalpha() and
+                          os.path.join(parent, s) not in blacklist]
 
 
 def get_changed_files():
@@ -104,7 +105,7 @@ def run_tests_in_sesssion(
 
     if use_appengine:
         setup_appengine(session)
-        sample_root = 'appengine'
+        sample_root = 'appengine/standard'
     else:
         sample_root = '.'
 
diff --git a/testing/resources/test-env.tmpl.sh b/testing/resources/test-env.tmpl.sh
index 60c0f6f253a..e1a03d65cc8 100644
--- a/testing/resources/test-env.tmpl.sh
+++ b/testing/resources/test-env.tmpl.sh
@@ -2,7 +2,7 @@
 export GCLOUD_PROJECT=your-project-id
 export CLOUD_STORAGE_BUCKET=$GCLOUD_PROJECT
 
-# Environment variables for Managed VMs system tests.
+# Environment variables for App Engine Flexible system tests.
 export GA_TRACKING_ID=
 export SQLALCHEMY_DATABASE_URI=sqlite://
 export PUBSUB_TOPIC=gae-mvm-pubsub-topic