diff --git a/appengine/CONTRIBUTING.md b/managed_vms/CONTRIBUTING.md
similarity index 100%
rename from appengine/CONTRIBUTING.md
rename to managed_vms/CONTRIBUTING.md
diff --git a/appengine/LICENSE b/managed_vms/LICENSE
similarity index 100%
rename from appengine/LICENSE
rename to managed_vms/LICENSE
diff --git a/appengine/README.md b/managed_vms/README.md
similarity index 100%
rename from appengine/README.md
rename to managed_vms/README.md
diff --git a/appengine/analytics/pom.xml b/managed_vms/analytics/pom.xml
similarity index 100%
rename from appengine/analytics/pom.xml
rename to managed_vms/analytics/pom.xml
diff --git a/appengine/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java b/managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
similarity index 100%
rename from appengine/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
rename to managed_vms/analytics/src/main/java/com/example/managedvms/analytics/AnalyticsServlet.java
diff --git a/appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/analytics/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/analytics/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/cloudsql/README.md b/managed_vms/cloudsql/README.md
similarity index 100%
rename from appengine/cloudsql/README.md
rename to managed_vms/cloudsql/README.md
diff --git a/appengine/cloudsql/pom.xml b/managed_vms/cloudsql/pom.xml
similarity index 100%
rename from appengine/cloudsql/pom.xml
rename to managed_vms/cloudsql/pom.xml
diff --git a/appengine/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java b/managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
similarity index 100%
rename from appengine/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
rename to managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java
diff --git a/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/cloudstorage/README.md b/managed_vms/cloudstorage/README.md
similarity index 100%
rename from appengine/cloudstorage/README.md
rename to managed_vms/cloudstorage/README.md
diff --git a/appengine/cloudstorage/pom.xml b/managed_vms/cloudstorage/pom.xml
similarity index 100%
rename from appengine/cloudstorage/pom.xml
rename to managed_vms/cloudstorage/pom.xml
diff --git a/appengine/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java b/managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
similarity index 100%
rename from appengine/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
rename to managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java
diff --git a/appengine/cloudstorage/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/cloudstorage/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/cloudstorage/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/cloudstorage/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/cloudstorage/src/main/webapp/index.html b/managed_vms/cloudstorage/src/main/webapp/index.html
similarity index 100%
rename from appengine/cloudstorage/src/main/webapp/index.html
rename to managed_vms/cloudstorage/src/main/webapp/index.html
diff --git a/appengine/datastore/pom.xml b/managed_vms/datastore/pom.xml
similarity index 100%
rename from appengine/datastore/pom.xml
rename to managed_vms/datastore/pom.xml
diff --git a/appengine/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java b/managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
similarity index 100%
rename from appengine/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
rename to managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/datastore/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/datastore/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/disk/pom.xml b/managed_vms/disk/pom.xml
similarity index 100%
rename from appengine/disk/pom.xml
rename to managed_vms/disk/pom.xml
diff --git a/appengine/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java b/managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
similarity index 100%
rename from appengine/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
rename to managed_vms/disk/src/main/java/com/example/managedvms/disk/DiskServlet.java
diff --git a/appengine/disk/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/disk/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/disk/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/disk/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/extending-runtime/README.md b/managed_vms/extending-runtime/README.md
similarity index 100%
rename from appengine/extending-runtime/README.md
rename to managed_vms/extending-runtime/README.md
diff --git a/appengine/extending-runtime/pom.xml b/managed_vms/extending-runtime/pom.xml
similarity index 100%
rename from appengine/extending-runtime/pom.xml
rename to managed_vms/extending-runtime/pom.xml
diff --git a/appengine/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java b/managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
similarity index 100%
rename from appengine/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
rename to managed_vms/extending-runtime/src/main/java/com/example/managedvms/extendingruntime/FortuneServlet.java
diff --git a/appengine/extending-runtime/src/main/webapp/Dockerfile b/managed_vms/extending-runtime/src/main/webapp/Dockerfile
similarity index 100%
rename from appengine/extending-runtime/src/main/webapp/Dockerfile
rename to managed_vms/extending-runtime/src/main/webapp/Dockerfile
diff --git a/appengine/extending-runtime/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/extending-runtime/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/extending-runtime/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/extending-runtime/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/helloworld-mvm/README.md b/managed_vms/helloworld/README.md
similarity index 100%
rename from appengine/helloworld-mvm/README.md
rename to managed_vms/helloworld/README.md
diff --git a/appengine/helloworld-mvm/pom.xml b/managed_vms/helloworld/pom.xml
similarity index 100%
rename from appengine/helloworld-mvm/pom.xml
rename to managed_vms/helloworld/pom.xml
diff --git a/appengine/helloworld-mvm/src/main/java/com/example/appengine/helloworld/HelloServlet.java b/managed_vms/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
similarity index 100%
rename from appengine/helloworld-mvm/src/main/java/com/example/appengine/helloworld/HelloServlet.java
rename to managed_vms/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
diff --git a/appengine/helloworld-mvm/src/main/java/com/example/managedvms/helloworld/HelloServlet.java b/managed_vms/helloworld/src/main/java/com/example/managedvms/helloworld/HelloServlet.java
similarity index 100%
rename from appengine/helloworld-mvm/src/main/java/com/example/managedvms/helloworld/HelloServlet.java
rename to managed_vms/helloworld/src/main/java/com/example/managedvms/helloworld/HelloServlet.java
diff --git a/appengine/helloworld-mvm/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/helloworld-mvm/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/helloworld-mvm/src/main/webapp/WEB-INF/web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine/helloworld-mvm/src/main/webapp/WEB-INF/web.xml
rename to managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine/mailgun/README.md b/managed_vms/mailgun/README.md
similarity index 100%
rename from appengine/mailgun/README.md
rename to managed_vms/mailgun/README.md
diff --git a/appengine/mailgun/pom.xml b/managed_vms/mailgun/pom.xml
similarity index 100%
rename from appengine/mailgun/pom.xml
rename to managed_vms/mailgun/pom.xml
diff --git a/appengine/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java b/managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
similarity index 100%
rename from appengine/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
rename to managed_vms/mailgun/src/main/java/com/example/managedvms/mailgun/MailgunServlet.java
diff --git a/appengine/mailgun/src/main/resources/example-attachment.txt b/managed_vms/mailgun/src/main/resources/example-attachment.txt
similarity index 100%
rename from appengine/mailgun/src/main/resources/example-attachment.txt
rename to managed_vms/mailgun/src/main/resources/example-attachment.txt
diff --git a/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/mailgun/src/main/webapp/index.html b/managed_vms/mailgun/src/main/webapp/index.html
similarity index 100%
rename from appengine/mailgun/src/main/webapp/index.html
rename to managed_vms/mailgun/src/main/webapp/index.html
diff --git a/appengine/memcache/pom.xml b/managed_vms/memcache/pom.xml
similarity index 100%
rename from appengine/memcache/pom.xml
rename to managed_vms/memcache/pom.xml
diff --git a/appengine/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java b/managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
similarity index 100%
rename from appengine/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
rename to managed_vms/memcache/src/main/java/com/example/managedvms/memcache/MemcacheServlet.java
diff --git a/appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/memcache/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/memcache/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/sendgrid/README.md b/managed_vms/sendgrid/README.md
similarity index 100%
rename from appengine/sendgrid/README.md
rename to managed_vms/sendgrid/README.md
diff --git a/appengine/sendgrid/pom.xml b/managed_vms/sendgrid/pom.xml
similarity index 100%
rename from appengine/sendgrid/pom.xml
rename to managed_vms/sendgrid/pom.xml
diff --git a/appengine/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java b/managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
similarity index 100%
rename from appengine/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
rename to managed_vms/sendgrid/src/main/java/com/example/managedvms/sendgrid/SendEmailServlet.java
diff --git a/appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/managedvms/sparkjava/README.md b/managed_vms/sparkjava/README.md
similarity index 100%
rename from managedvms/sparkjava/README.md
rename to managed_vms/sparkjava/README.md
diff --git a/managedvms/sparkjava/pom.xml b/managed_vms/sparkjava/pom.xml
similarity index 100%
rename from managedvms/sparkjava/pom.xml
rename to managed_vms/sparkjava/pom.xml
diff --git a/managedvms/sparkjava/src/main/appengine/Dockerfile b/managed_vms/sparkjava/src/main/appengine/Dockerfile
similarity index 100%
rename from managedvms/sparkjava/src/main/appengine/Dockerfile
rename to managed_vms/sparkjava/src/main/appengine/Dockerfile
diff --git a/managedvms/sparkjava/src/main/appengine/app.yaml b/managed_vms/sparkjava/src/main/appengine/app.yaml
similarity index 100%
rename from managedvms/sparkjava/src/main/appengine/app.yaml
rename to managed_vms/sparkjava/src/main/appengine/app.yaml
diff --git a/managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
similarity index 100%
rename from managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
rename to managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
diff --git a/managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
similarity index 100%
rename from managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
rename to managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
diff --git a/managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
similarity index 100%
rename from managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
rename to managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
diff --git a/managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
similarity index 100%
rename from managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
rename to managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
diff --git a/managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
similarity index 100%
rename from managedvms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
rename to managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
diff --git a/managedvms/sparkjava/src/main/resources/public/index.html b/managed_vms/sparkjava/src/main/resources/public/index.html
similarity index 100%
rename from managedvms/sparkjava/src/main/resources/public/index.html
rename to managed_vms/sparkjava/src/main/resources/public/index.html
diff --git a/managedvms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java b/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
similarity index 100%
rename from managedvms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
rename to managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
diff --git a/managedvms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
similarity index 100%
rename from managedvms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
rename to managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
diff --git a/appengine/static-files/pom.xml b/managed_vms/static-files/pom.xml
similarity index 100%
rename from appengine/static-files/pom.xml
rename to managed_vms/static-files/pom.xml
diff --git a/appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/static-files/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/static-files/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/static-files/src/main/webapp/index.html b/managed_vms/static-files/src/main/webapp/index.html
similarity index 100%
rename from appengine/static-files/src/main/webapp/index.html
rename to managed_vms/static-files/src/main/webapp/index.html
diff --git a/appengine/static-files/src/main/webapp/stylesheets/styles.css b/managed_vms/static-files/src/main/webapp/stylesheets/styles.css
similarity index 100%
rename from appengine/static-files/src/main/webapp/stylesheets/styles.css
rename to managed_vms/static-files/src/main/webapp/stylesheets/styles.css
diff --git a/appengine/twilio/README.md b/managed_vms/twilio/README.md
similarity index 100%
rename from appengine/twilio/README.md
rename to managed_vms/twilio/README.md
diff --git a/appengine/twilio/pom.xml b/managed_vms/twilio/pom.xml
similarity index 100%
rename from appengine/twilio/pom.xml
rename to managed_vms/twilio/pom.xml
diff --git a/appengine/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
similarity index 100%
rename from appengine/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
rename to managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveCallServlet.java
diff --git a/appengine/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
similarity index 100%
rename from appengine/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
rename to managed_vms/twilio/src/main/java/com/example/managedvms/twilio/ReceiveSmsServlet.java
diff --git a/appengine/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java b/managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
similarity index 100%
rename from appengine/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
rename to managed_vms/twilio/src/main/java/com/example/managedvms/twilio/SendSmsServlet.java
diff --git a/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/twilio/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/twilio/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/websockets/README.md b/managed_vms/websockets/README.md
similarity index 100%
rename from appengine/websockets/README.md
rename to managed_vms/websockets/README.md
diff --git a/appengine/websockets/pom.xml b/managed_vms/websockets/pom.xml
similarity index 100%
rename from appengine/websockets/pom.xml
rename to managed_vms/websockets/pom.xml
diff --git a/appengine/websockets/src/main/java/com/example/managedvms/websockets/EchoEndpoint.java b/managed_vms/websockets/src/main/java/com/example/managedvms/websockets/EchoEndpoint.java
similarity index 100%
rename from appengine/websockets/src/main/java/com/example/managedvms/websockets/EchoEndpoint.java
rename to managed_vms/websockets/src/main/java/com/example/managedvms/websockets/EchoEndpoint.java
diff --git a/appengine/websockets/src/main/java/com/example/managedvms/websockets/WebsocketServlet.java b/managed_vms/websockets/src/main/java/com/example/managedvms/websockets/WebsocketServlet.java
similarity index 100%
rename from appengine/websockets/src/main/java/com/example/managedvms/websockets/WebsocketServlet.java
rename to managed_vms/websockets/src/main/java/com/example/managedvms/websockets/WebsocketServlet.java
diff --git a/appengine/websockets/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/websockets/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine/websockets/src/main/webapp/WEB-INF/appengine-web.xml
rename to managed_vms/websockets/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine/websockets/src/main/webapp/WEB-INF/web.xml b/managed_vms/websockets/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine/websockets/src/main/webapp/WEB-INF/web.xml
rename to managed_vms/websockets/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine/websockets/src/main/webapp/index.jsp b/managed_vms/websockets/src/main/webapp/index.jsp
similarity index 100%
rename from appengine/websockets/src/main/webapp/index.jsp
rename to managed_vms/websockets/src/main/webapp/index.jsp