diff --git a/managed_vms/.gitignore b/flexible/.gitignore
similarity index 100%
rename from managed_vms/.gitignore
rename to flexible/.gitignore
diff --git a/managed_vms/CONTRIBUTING.md b/flexible/CONTRIBUTING.md
similarity index 100%
rename from managed_vms/CONTRIBUTING.md
rename to flexible/CONTRIBUTING.md
diff --git a/managed_vms/LICENSE b/flexible/LICENSE
similarity index 100%
rename from managed_vms/LICENSE
rename to flexible/LICENSE
diff --git a/managed_vms/README.md b/flexible/README.md
similarity index 100%
rename from managed_vms/README.md
rename to flexible/README.md
diff --git a/managed_vms/analytics/pom.xml b/flexible/analytics/pom.xml
similarity index 100%
rename from managed_vms/analytics/pom.xml
rename to flexible/analytics/pom.xml
diff --git a/managed_vms/analytics/src/main/appengine/app.yaml b/flexible/analytics/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/analytics/src/main/appengine/app.yaml
rename to flexible/analytics/src/main/appengine/app.yaml
diff --git a/managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java b/flexible/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
similarity index 100%
rename from managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
rename to flexible/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
diff --git a/managed_vms/async-rest/LICENSE b/flexible/async-rest/LICENSE
similarity index 100%
rename from managed_vms/async-rest/LICENSE
rename to flexible/async-rest/LICENSE
diff --git a/managed_vms/async-rest/README.md b/flexible/async-rest/README.md
similarity index 100%
rename from managed_vms/async-rest/README.md
rename to flexible/async-rest/README.md
diff --git a/managed_vms/async-rest/pom.xml b/flexible/async-rest/pom.xml
similarity index 100%
rename from managed_vms/async-rest/pom.xml
rename to flexible/async-rest/pom.xml
diff --git a/managed_vms/async-rest/src/main/appengine/app.yaml b/flexible/async-rest/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/async-rest/src/main/appengine/app.yaml
rename to flexible/async-rest/src/main/appengine/app.yaml
diff --git a/managed_vms/async-rest/src/main/docker/Dockerfile b/flexible/async-rest/src/main/docker/Dockerfile
similarity index 100%
rename from managed_vms/async-rest/src/main/docker/Dockerfile
rename to flexible/async-rest/src/main/docker/Dockerfile
diff --git a/managed_vms/async-rest/src/main/docker/jetty-logging.properties b/flexible/async-rest/src/main/docker/jetty-logging.properties
similarity index 100%
rename from managed_vms/async-rest/src/main/docker/jetty-logging.properties
rename to flexible/async-rest/src/main/docker/jetty-logging.properties
diff --git a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
similarity index 100%
rename from managed_vms/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
rename to flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
diff --git a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
similarity index 100%
rename from managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
rename to flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
diff --git a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
similarity index 100%
rename from managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
rename to flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
diff --git a/managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
similarity index 100%
rename from managed_vms/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
rename to flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
diff --git a/managed_vms/async-rest/src/main/webapp/WEB-INF/jetty-web.xml b/flexible/async-rest/src/main/webapp/WEB-INF/jetty-web.xml
similarity index 100%
rename from managed_vms/async-rest/src/main/webapp/WEB-INF/jetty-web.xml
rename to flexible/async-rest/src/main/webapp/WEB-INF/jetty-web.xml
diff --git a/managed_vms/async-rest/src/main/webapp/WEB-INF/web.xml b/flexible/async-rest/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from managed_vms/async-rest/src/main/webapp/WEB-INF/web.xml
rename to flexible/async-rest/src/main/webapp/WEB-INF/web.xml
diff --git a/managed_vms/async-rest/src/main/webapp/asyncrest/green.png b/flexible/async-rest/src/main/webapp/asyncrest/green.png
similarity index 100%
rename from managed_vms/async-rest/src/main/webapp/asyncrest/green.png
rename to flexible/async-rest/src/main/webapp/asyncrest/green.png
diff --git a/managed_vms/async-rest/src/main/webapp/asyncrest/red.png b/flexible/async-rest/src/main/webapp/asyncrest/red.png
similarity index 100%
rename from managed_vms/async-rest/src/main/webapp/asyncrest/red.png
rename to flexible/async-rest/src/main/webapp/asyncrest/red.png
diff --git a/managed_vms/async-rest/src/main/webapp/index.html b/flexible/async-rest/src/main/webapp/index.html
similarity index 100%
rename from managed_vms/async-rest/src/main/webapp/index.html
rename to flexible/async-rest/src/main/webapp/index.html
diff --git a/managed_vms/cloudsql/.gitignore b/flexible/cloudsql/.gitignore
similarity index 100%
rename from managed_vms/cloudsql/.gitignore
rename to flexible/cloudsql/.gitignore
diff --git a/managed_vms/cloudsql/README.md b/flexible/cloudsql/README.md
similarity index 100%
rename from managed_vms/cloudsql/README.md
rename to flexible/cloudsql/README.md
diff --git a/managed_vms/cloudsql/pom.xml b/flexible/cloudsql/pom.xml
similarity index 100%
rename from managed_vms/cloudsql/pom.xml
rename to flexible/cloudsql/pom.xml
diff --git a/managed_vms/cloudsql/src/main/appengine/app.yaml b/flexible/cloudsql/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/cloudsql/src/main/appengine/app.yaml
rename to flexible/cloudsql/src/main/appengine/app.yaml
diff --git a/managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java b/flexible/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
similarity index 100%
rename from managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
rename to flexible/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
diff --git a/managed_vms/cloudstorage/README.md b/flexible/cloudstorage/README.md
similarity index 100%
rename from managed_vms/cloudstorage/README.md
rename to flexible/cloudstorage/README.md
diff --git a/managed_vms/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
similarity index 100%
rename from managed_vms/cloudstorage/pom.xml
rename to flexible/cloudstorage/pom.xml
diff --git a/managed_vms/cloudstorage/src/main/appengine/app.yaml b/flexible/cloudstorage/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/cloudstorage/src/main/appengine/app.yaml
rename to flexible/cloudstorage/src/main/appengine/app.yaml
diff --git a/managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java b/flexible/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
similarity index 100%
rename from managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
rename to flexible/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
diff --git a/managed_vms/cloudstorage/src/main/webapp/index.html b/flexible/cloudstorage/src/main/webapp/index.html
similarity index 100%
rename from managed_vms/cloudstorage/src/main/webapp/index.html
rename to flexible/cloudstorage/src/main/webapp/index.html
diff --git a/managed_vms/cron/README.md b/flexible/cron/README.md
similarity index 100%
rename from managed_vms/cron/README.md
rename to flexible/cron/README.md
diff --git a/managed_vms/cron/pom.xml b/flexible/cron/pom.xml
similarity index 100%
rename from managed_vms/cron/pom.xml
rename to flexible/cron/pom.xml
diff --git a/managed_vms/cron/src/main/appengine/app.yaml b/flexible/cron/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/cron/src/main/appengine/app.yaml
rename to flexible/cron/src/main/appengine/app.yaml
diff --git a/managed_vms/cron/src/main/appengine/cron.yaml b/flexible/cron/src/main/appengine/cron.yaml
similarity index 100%
rename from managed_vms/cron/src/main/appengine/cron.yaml
rename to flexible/cron/src/main/appengine/cron.yaml
diff --git a/managed_vms/cron/src/main/java/com/example/managedvms/cron/CronServlet.java b/flexible/cron/src/main/java/com/example/managedvms/cron/CronServlet.java
similarity index 100%
rename from managed_vms/cron/src/main/java/com/example/managedvms/cron/CronServlet.java
rename to flexible/cron/src/main/java/com/example/managedvms/cron/CronServlet.java
diff --git a/managed_vms/datastore/pom.xml b/flexible/datastore/pom.xml
similarity index 100%
rename from managed_vms/datastore/pom.xml
rename to flexible/datastore/pom.xml
diff --git a/managed_vms/datastore/src/main/appengine/app.yaml b/flexible/datastore/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/datastore/src/main/appengine/app.yaml
rename to flexible/datastore/src/main/appengine/app.yaml
diff --git a/managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java b/flexible/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
similarity index 100%
rename from managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
rename to flexible/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
diff --git a/managed_vms/disk/pom.xml b/flexible/disk/pom.xml
similarity index 100%
rename from managed_vms/disk/pom.xml
rename to flexible/disk/pom.xml
diff --git a/managed_vms/disk/src/main/appengine/app.yaml b/flexible/disk/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/disk/src/main/appengine/app.yaml
rename to flexible/disk/src/main/appengine/app.yaml
diff --git a/managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java b/flexible/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
similarity index 100%
rename from managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
rename to flexible/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
diff --git a/managed_vms/endpoints/README.md b/flexible/endpoints/README.md
similarity index 100%
rename from managed_vms/endpoints/README.md
rename to flexible/endpoints/README.md
diff --git a/managed_vms/endpoints/pom.xml b/flexible/endpoints/pom.xml
similarity index 100%
rename from managed_vms/endpoints/pom.xml
rename to flexible/endpoints/pom.xml
diff --git a/managed_vms/endpoints/src/main/appengine/Dockerfile b/flexible/endpoints/src/main/appengine/Dockerfile
similarity index 100%
rename from managed_vms/endpoints/src/main/appengine/Dockerfile
rename to flexible/endpoints/src/main/appengine/Dockerfile
diff --git a/managed_vms/endpoints/src/main/appengine/app.yaml b/flexible/endpoints/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/endpoints/src/main/appengine/app.yaml
rename to flexible/endpoints/src/main/appengine/app.yaml
diff --git a/managed_vms/endpoints/src/main/appengine/swagger.yaml b/flexible/endpoints/src/main/appengine/swagger.yaml
similarity index 100%
rename from managed_vms/endpoints/src/main/appengine/swagger.yaml
rename to flexible/endpoints/src/main/appengine/swagger.yaml
diff --git a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java b/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
similarity index 100%
rename from managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
rename to flexible/endpoints/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
diff --git a/managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java b/flexible/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
similarity index 100%
rename from managed_vms/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
rename to flexible/endpoints/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
diff --git a/managed_vms/extending-runtime/README.md b/flexible/extending-runtime/README.md
similarity index 100%
rename from managed_vms/extending-runtime/README.md
rename to flexible/extending-runtime/README.md
diff --git a/managed_vms/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml
similarity index 100%
rename from managed_vms/extending-runtime/pom.xml
rename to flexible/extending-runtime/pom.xml
diff --git a/managed_vms/extending-runtime/src/main/appengine/Dockerfile b/flexible/extending-runtime/src/main/appengine/Dockerfile
similarity index 100%
rename from managed_vms/extending-runtime/src/main/appengine/Dockerfile
rename to flexible/extending-runtime/src/main/appengine/Dockerfile
diff --git a/managed_vms/extending-runtime/src/main/appengine/app.yaml b/flexible/extending-runtime/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/extending-runtime/src/main/appengine/app.yaml
rename to flexible/extending-runtime/src/main/appengine/app.yaml
diff --git a/managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java b/flexible/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
similarity index 100%
rename from managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
rename to flexible/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
diff --git a/managed_vms/helloworld/README.md b/flexible/helloworld/README.md
similarity index 100%
rename from managed_vms/helloworld/README.md
rename to flexible/helloworld/README.md
diff --git a/managed_vms/helloworld/build.gradle b/flexible/helloworld/build.gradle
similarity index 100%
rename from managed_vms/helloworld/build.gradle
rename to flexible/helloworld/build.gradle
diff --git a/managed_vms/helloworld/gradle/wrapper/gradle-wrapper.properties b/flexible/helloworld/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from managed_vms/helloworld/gradle/wrapper/gradle-wrapper.properties
rename to flexible/helloworld/gradle/wrapper/gradle-wrapper.properties
diff --git a/managed_vms/helloworld/gradlew b/flexible/helloworld/gradlew
similarity index 100%
rename from managed_vms/helloworld/gradlew
rename to flexible/helloworld/gradlew
diff --git a/managed_vms/helloworld/gradlew.bat b/flexible/helloworld/gradlew.bat
similarity index 100%
rename from managed_vms/helloworld/gradlew.bat
rename to flexible/helloworld/gradlew.bat
diff --git a/managed_vms/helloworld/pom.xml b/flexible/helloworld/pom.xml
similarity index 100%
rename from managed_vms/helloworld/pom.xml
rename to flexible/helloworld/pom.xml
diff --git a/managed_vms/helloworld/src/main/appengine/app.yaml b/flexible/helloworld/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/helloworld/src/main/appengine/app.yaml
rename to flexible/helloworld/src/main/appengine/app.yaml
diff --git a/managed_vms/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java b/flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
similarity index 100%
rename from managed_vms/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
rename to flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
diff --git a/managed_vms/mailgun/README.md b/flexible/mailgun/README.md
similarity index 100%
rename from managed_vms/mailgun/README.md
rename to flexible/mailgun/README.md
diff --git a/managed_vms/mailgun/pom.xml b/flexible/mailgun/pom.xml
similarity index 100%
rename from managed_vms/mailgun/pom.xml
rename to flexible/mailgun/pom.xml
diff --git a/managed_vms/mailgun/src/main/appengine/app.yaml b/flexible/mailgun/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/mailgun/src/main/appengine/app.yaml
rename to flexible/mailgun/src/main/appengine/app.yaml
diff --git a/managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java b/flexible/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
similarity index 100%
rename from managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
rename to flexible/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
diff --git a/managed_vms/mailgun/src/main/resources/example-attachment.txt b/flexible/mailgun/src/main/resources/example-attachment.txt
similarity index 100%
rename from managed_vms/mailgun/src/main/resources/example-attachment.txt
rename to flexible/mailgun/src/main/resources/example-attachment.txt
diff --git a/managed_vms/mailgun/src/main/webapp/index.html b/flexible/mailgun/src/main/webapp/index.html
similarity index 100%
rename from managed_vms/mailgun/src/main/webapp/index.html
rename to flexible/mailgun/src/main/webapp/index.html
diff --git a/managed_vms/mailjet/README.md b/flexible/mailjet/README.md
similarity index 100%
rename from managed_vms/mailjet/README.md
rename to flexible/mailjet/README.md
diff --git a/managed_vms/mailjet/pom.xml b/flexible/mailjet/pom.xml
similarity index 100%
rename from managed_vms/mailjet/pom.xml
rename to flexible/mailjet/pom.xml
diff --git a/managed_vms/mailjet/src/main/appengine/app.yaml b/flexible/mailjet/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/mailjet/src/main/appengine/app.yaml
rename to flexible/mailjet/src/main/appengine/app.yaml
diff --git a/managed_vms/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
similarity index 100%
rename from managed_vms/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
rename to flexible/mailjet/src/main/java/com/example/managedvms/mailjet/MailjetServlet.java
diff --git a/managed_vms/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar b/flexible/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
similarity index 100%
rename from managed_vms/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
rename to flexible/mailjet/src/main/webapp/WEB-INF/lib/client-3.1.1-jar-with-dependencies.jar
diff --git a/managed_vms/mailjet/src/main/webapp/index.html b/flexible/mailjet/src/main/webapp/index.html
similarity index 100%
rename from managed_vms/mailjet/src/main/webapp/index.html
rename to flexible/mailjet/src/main/webapp/index.html
diff --git a/managed_vms/memcache/pom.xml b/flexible/memcache/pom.xml
similarity index 100%
rename from managed_vms/memcache/pom.xml
rename to flexible/memcache/pom.xml
diff --git a/managed_vms/memcache/src/main/appengine/app.yaml b/flexible/memcache/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/memcache/src/main/appengine/app.yaml
rename to flexible/memcache/src/main/appengine/app.yaml
diff --git a/managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java b/flexible/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
similarity index 100%
rename from managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
rename to flexible/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
diff --git a/managed_vms/sendgrid/README.md b/flexible/sendgrid/README.md
similarity index 100%
rename from managed_vms/sendgrid/README.md
rename to flexible/sendgrid/README.md
diff --git a/managed_vms/sendgrid/pom.xml b/flexible/sendgrid/pom.xml
similarity index 100%
rename from managed_vms/sendgrid/pom.xml
rename to flexible/sendgrid/pom.xml
diff --git a/managed_vms/sendgrid/src/main/appengine/app.yaml b/flexible/sendgrid/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/sendgrid/src/main/appengine/app.yaml
rename to flexible/sendgrid/src/main/appengine/app.yaml
diff --git a/managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java b/flexible/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
similarity index 100%
rename from managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
rename to flexible/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
diff --git a/managed_vms/sparkjava/README.md b/flexible/sparkjava/README.md
similarity index 100%
rename from managed_vms/sparkjava/README.md
rename to flexible/sparkjava/README.md
diff --git a/managed_vms/sparkjava/pom.xml b/flexible/sparkjava/pom.xml
similarity index 100%
rename from managed_vms/sparkjava/pom.xml
rename to flexible/sparkjava/pom.xml
diff --git a/managed_vms/sparkjava/src/main/appengine/Dockerfile b/flexible/sparkjava/src/main/appengine/Dockerfile
similarity index 100%
rename from managed_vms/sparkjava/src/main/appengine/Dockerfile
rename to flexible/sparkjava/src/main/appengine/Dockerfile
diff --git a/managed_vms/sparkjava/src/main/appengine/app.yaml b/flexible/sparkjava/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/sparkjava/src/main/appengine/app.yaml
rename to flexible/sparkjava/src/main/appengine/app.yaml
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
similarity index 100%
rename from managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
rename to flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
similarity index 100%
rename from managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
rename to flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
similarity index 100%
rename from managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
rename to flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
similarity index 100%
rename from managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
rename to flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
diff --git a/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
similarity index 100%
rename from managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
rename to flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
diff --git a/managed_vms/sparkjava/src/main/resources/public/index.html b/flexible/sparkjava/src/main/resources/public/index.html
similarity index 100%
rename from managed_vms/sparkjava/src/main/resources/public/index.html
rename to flexible/sparkjava/src/main/resources/public/index.html
diff --git a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
similarity index 100%
rename from managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
rename to flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
diff --git a/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
similarity index 100%
rename from managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
rename to flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
diff --git a/managed_vms/static-files/pom.xml b/flexible/static-files/pom.xml
similarity index 100%
rename from managed_vms/static-files/pom.xml
rename to flexible/static-files/pom.xml
diff --git a/managed_vms/static-files/src/main/appengine/app.yaml b/flexible/static-files/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/static-files/src/main/appengine/app.yaml
rename to flexible/static-files/src/main/appengine/app.yaml
diff --git a/managed_vms/static-files/src/main/webapp/index.html b/flexible/static-files/src/main/webapp/index.html
similarity index 100%
rename from managed_vms/static-files/src/main/webapp/index.html
rename to flexible/static-files/src/main/webapp/index.html
diff --git a/managed_vms/static-files/src/main/webapp/stylesheets/styles.css b/flexible/static-files/src/main/webapp/stylesheets/styles.css
similarity index 100%
rename from managed_vms/static-files/src/main/webapp/stylesheets/styles.css
rename to flexible/static-files/src/main/webapp/stylesheets/styles.css
diff --git a/managed_vms/twilio/README.md b/flexible/twilio/README.md
similarity index 100%
rename from managed_vms/twilio/README.md
rename to flexible/twilio/README.md
diff --git a/managed_vms/twilio/pom.xml b/flexible/twilio/pom.xml
similarity index 100%
rename from managed_vms/twilio/pom.xml
rename to flexible/twilio/pom.xml
diff --git a/managed_vms/twilio/src/main/appengine/app.yaml b/flexible/twilio/src/main/appengine/app.yaml
similarity index 100%
rename from managed_vms/twilio/src/main/appengine/app.yaml
rename to flexible/twilio/src/main/appengine/app.yaml
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java b/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
similarity index 100%
rename from managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
rename to flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java b/flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
similarity index 100%
rename from managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
rename to flexible/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
diff --git a/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java b/flexible/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
similarity index 100%
rename from managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
rename to flexible/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java