diff --git a/play-framework/student-api/.gitignore b/play-framework/introduction/.gitignore
similarity index 100%
rename from play-framework/student-api/.gitignore
rename to play-framework/introduction/.gitignore
diff --git a/play-framework/student-api/LICENSE b/play-framework/introduction/LICENSE
similarity index 100%
rename from play-framework/student-api/LICENSE
rename to play-framework/introduction/LICENSE
diff --git a/play-framework/student-api/README b/play-framework/introduction/README
similarity index 100%
rename from play-framework/student-api/README
rename to play-framework/introduction/README
diff --git a/play-framework/student-api/app/Filters.java b/play-framework/introduction/app/Filters.java
similarity index 100%
rename from play-framework/student-api/app/Filters.java
rename to play-framework/introduction/app/Filters.java
diff --git a/play-framework/student-api/app/Module.java b/play-framework/introduction/app/Module.java
similarity index 100%
rename from play-framework/student-api/app/Module.java
rename to play-framework/introduction/app/Module.java
diff --git a/play-framework/student-api/app/controllers/AsyncController.java b/play-framework/introduction/app/controllers/AsyncController.java
similarity index 100%
rename from play-framework/student-api/app/controllers/AsyncController.java
rename to play-framework/introduction/app/controllers/AsyncController.java
diff --git a/play-framework/student-api/app/controllers/CountController.java b/play-framework/introduction/app/controllers/CountController.java
similarity index 100%
rename from play-framework/student-api/app/controllers/CountController.java
rename to play-framework/introduction/app/controllers/CountController.java
diff --git a/play-framework/student-api/app/controllers/HomeController.java b/play-framework/introduction/app/controllers/HomeController.java
similarity index 100%
rename from play-framework/student-api/app/controllers/HomeController.java
rename to play-framework/introduction/app/controllers/HomeController.java
diff --git a/play-framework/student-api/app/controllers/StudentController.java b/play-framework/introduction/app/controllers/StudentController.java
similarity index 100%
rename from play-framework/student-api/app/controllers/StudentController.java
rename to play-framework/introduction/app/controllers/StudentController.java
diff --git a/play-framework/student-api/app/filters/ExampleFilter.java b/play-framework/introduction/app/filters/ExampleFilter.java
similarity index 100%
rename from play-framework/student-api/app/filters/ExampleFilter.java
rename to play-framework/introduction/app/filters/ExampleFilter.java
diff --git a/play-framework/student-api/app/models/Student.java b/play-framework/introduction/app/models/Student.java
similarity index 100%
rename from play-framework/student-api/app/models/Student.java
rename to play-framework/introduction/app/models/Student.java
diff --git a/play-framework/student-api/app/models/StudentStore.java b/play-framework/introduction/app/models/StudentStore.java
similarity index 100%
rename from play-framework/student-api/app/models/StudentStore.java
rename to play-framework/introduction/app/models/StudentStore.java
diff --git a/play-framework/student-api/app/services/ApplicationTimer.java b/play-framework/introduction/app/services/ApplicationTimer.java
similarity index 100%
rename from play-framework/student-api/app/services/ApplicationTimer.java
rename to play-framework/introduction/app/services/ApplicationTimer.java
diff --git a/play-framework/student-api/app/services/AtomicCounter.java b/play-framework/introduction/app/services/AtomicCounter.java
similarity index 100%
rename from play-framework/student-api/app/services/AtomicCounter.java
rename to play-framework/introduction/app/services/AtomicCounter.java
diff --git a/play-framework/student-api/app/services/Counter.java b/play-framework/introduction/app/services/Counter.java
similarity index 100%
rename from play-framework/student-api/app/services/Counter.java
rename to play-framework/introduction/app/services/Counter.java
diff --git a/play-framework/student-api/app/util/Util.java b/play-framework/introduction/app/util/Util.java
similarity index 100%
rename from play-framework/student-api/app/util/Util.java
rename to play-framework/introduction/app/util/Util.java
diff --git a/play-framework/student-api/app/views/index.scala.html b/play-framework/introduction/app/views/index.scala.html
similarity index 100%
rename from play-framework/student-api/app/views/index.scala.html
rename to play-framework/introduction/app/views/index.scala.html
diff --git a/play-framework/student-api/app/views/main.scala.html b/play-framework/introduction/app/views/main.scala.html
similarity index 100%
rename from play-framework/student-api/app/views/main.scala.html
rename to play-framework/introduction/app/views/main.scala.html
diff --git a/play-framework/student-api/bin/activator b/play-framework/introduction/bin/activator
similarity index 100%
rename from play-framework/student-api/bin/activator
rename to play-framework/introduction/bin/activator
diff --git a/play-framework/student-api/bin/activator.bat b/play-framework/introduction/bin/activator.bat
similarity index 100%
rename from play-framework/student-api/bin/activator.bat
rename to play-framework/introduction/bin/activator.bat
diff --git a/play-framework/student-api/build.sbt b/play-framework/introduction/build.sbt
similarity index 100%
rename from play-framework/student-api/build.sbt
rename to play-framework/introduction/build.sbt
diff --git a/play-framework/student-api/conf/application.conf b/play-framework/introduction/conf/application.conf
similarity index 100%
rename from play-framework/student-api/conf/application.conf
rename to play-framework/introduction/conf/application.conf
diff --git a/play-framework/student-api/conf/logback.xml b/play-framework/introduction/conf/logback.xml
similarity index 100%
rename from play-framework/student-api/conf/logback.xml
rename to play-framework/introduction/conf/logback.xml
diff --git a/play-framework/student-api/conf/routes b/play-framework/introduction/conf/routes
similarity index 100%
rename from play-framework/student-api/conf/routes
rename to play-framework/introduction/conf/routes
diff --git a/play-framework/student-api/libexec/activator-launch-1.3.10.jar b/play-framework/introduction/libexec/activator-launch-1.3.10.jar
similarity index 100%
rename from play-framework/student-api/libexec/activator-launch-1.3.10.jar
rename to play-framework/introduction/libexec/activator-launch-1.3.10.jar
diff --git a/play-framework/student-api/project/build.properties b/play-framework/introduction/project/build.properties
similarity index 100%
rename from play-framework/student-api/project/build.properties
rename to play-framework/introduction/project/build.properties
diff --git a/play-framework/student-api/project/plugins.sbt b/play-framework/introduction/project/plugins.sbt
similarity index 100%
rename from play-framework/student-api/project/plugins.sbt
rename to play-framework/introduction/project/plugins.sbt
diff --git a/play-framework/student-api/public/images/favicon.png b/play-framework/introduction/public/images/favicon.png
similarity index 100%
rename from play-framework/student-api/public/images/favicon.png
rename to play-framework/introduction/public/images/favicon.png
diff --git a/play-framework/student-api/public/javascripts/hello.js b/play-framework/introduction/public/javascripts/hello.js
similarity index 100%
rename from play-framework/student-api/public/javascripts/hello.js
rename to play-framework/introduction/public/javascripts/hello.js
diff --git a/play-framework/student-api/public/stylesheets/main.css b/play-framework/introduction/public/stylesheets/main.css
similarity index 100%
rename from play-framework/student-api/public/stylesheets/main.css
rename to play-framework/introduction/public/stylesheets/main.css
diff --git a/play-framework/student-api/test/ApplicationTest.java b/play-framework/introduction/test/ApplicationTest.java
similarity index 100%
rename from play-framework/student-api/test/ApplicationTest.java
rename to play-framework/introduction/test/ApplicationTest.java
diff --git a/routing-in-play/.gitignore b/play-framework/routing-in-play/.gitignore
similarity index 100%
rename from routing-in-play/.gitignore
rename to play-framework/routing-in-play/.gitignore
diff --git a/routing-in-play/LICENSE b/play-framework/routing-in-play/LICENSE
similarity index 100%
rename from routing-in-play/LICENSE
rename to play-framework/routing-in-play/LICENSE
diff --git a/routing-in-play/README b/play-framework/routing-in-play/README
similarity index 100%
rename from routing-in-play/README
rename to play-framework/routing-in-play/README
diff --git a/routing-in-play/app/Filters.java b/play-framework/routing-in-play/app/Filters.java
similarity index 100%
rename from routing-in-play/app/Filters.java
rename to play-framework/routing-in-play/app/Filters.java
diff --git a/routing-in-play/app/Module.java b/play-framework/routing-in-play/app/Module.java
similarity index 100%
rename from routing-in-play/app/Module.java
rename to play-framework/routing-in-play/app/Module.java
diff --git a/routing-in-play/app/controllers/HomeController.java b/play-framework/routing-in-play/app/controllers/HomeController.java
similarity index 100%
rename from routing-in-play/app/controllers/HomeController.java
rename to play-framework/routing-in-play/app/controllers/HomeController.java
diff --git a/routing-in-play/app/filters/ExampleFilter.java b/play-framework/routing-in-play/app/filters/ExampleFilter.java
similarity index 100%
rename from routing-in-play/app/filters/ExampleFilter.java
rename to play-framework/routing-in-play/app/filters/ExampleFilter.java
diff --git a/routing-in-play/app/services/ApplicationTimer.java b/play-framework/routing-in-play/app/services/ApplicationTimer.java
similarity index 100%
rename from routing-in-play/app/services/ApplicationTimer.java
rename to play-framework/routing-in-play/app/services/ApplicationTimer.java
diff --git a/routing-in-play/app/services/AtomicCounter.java b/play-framework/routing-in-play/app/services/AtomicCounter.java
similarity index 100%
rename from routing-in-play/app/services/AtomicCounter.java
rename to play-framework/routing-in-play/app/services/AtomicCounter.java
diff --git a/routing-in-play/app/services/Counter.java b/play-framework/routing-in-play/app/services/Counter.java
similarity index 100%
rename from routing-in-play/app/services/Counter.java
rename to play-framework/routing-in-play/app/services/Counter.java
diff --git a/routing-in-play/app/views/index.scala.html b/play-framework/routing-in-play/app/views/index.scala.html
similarity index 100%
rename from routing-in-play/app/views/index.scala.html
rename to play-framework/routing-in-play/app/views/index.scala.html
diff --git a/routing-in-play/app/views/main.scala.html b/play-framework/routing-in-play/app/views/main.scala.html
similarity index 100%
rename from routing-in-play/app/views/main.scala.html
rename to play-framework/routing-in-play/app/views/main.scala.html
diff --git a/routing-in-play/bin/activator b/play-framework/routing-in-play/bin/activator
similarity index 100%
rename from routing-in-play/bin/activator
rename to play-framework/routing-in-play/bin/activator
diff --git a/routing-in-play/bin/activator.bat b/play-framework/routing-in-play/bin/activator.bat
similarity index 100%
rename from routing-in-play/bin/activator.bat
rename to play-framework/routing-in-play/bin/activator.bat
diff --git a/routing-in-play/build.sbt b/play-framework/routing-in-play/build.sbt
similarity index 100%
rename from routing-in-play/build.sbt
rename to play-framework/routing-in-play/build.sbt
diff --git a/routing-in-play/conf/application.conf b/play-framework/routing-in-play/conf/application.conf
similarity index 100%
rename from routing-in-play/conf/application.conf
rename to play-framework/routing-in-play/conf/application.conf
diff --git a/routing-in-play/conf/logback.xml b/play-framework/routing-in-play/conf/logback.xml
similarity index 100%
rename from routing-in-play/conf/logback.xml
rename to play-framework/routing-in-play/conf/logback.xml
diff --git a/routing-in-play/conf/routes b/play-framework/routing-in-play/conf/routes
similarity index 100%
rename from routing-in-play/conf/routes
rename to play-framework/routing-in-play/conf/routes
diff --git a/routing-in-play/libexec/activator-launch-1.3.10.jar b/play-framework/routing-in-play/libexec/activator-launch-1.3.10.jar
similarity index 100%
rename from routing-in-play/libexec/activator-launch-1.3.10.jar
rename to play-framework/routing-in-play/libexec/activator-launch-1.3.10.jar
diff --git a/routing-in-play/project/build.properties b/play-framework/routing-in-play/project/build.properties
similarity index 100%
rename from routing-in-play/project/build.properties
rename to play-framework/routing-in-play/project/build.properties
diff --git a/routing-in-play/project/plugins.sbt b/play-framework/routing-in-play/project/plugins.sbt
similarity index 100%
rename from routing-in-play/project/plugins.sbt
rename to play-framework/routing-in-play/project/plugins.sbt
diff --git a/routing-in-play/public/images/favicon.png b/play-framework/routing-in-play/public/images/favicon.png
similarity index 100%
rename from routing-in-play/public/images/favicon.png
rename to play-framework/routing-in-play/public/images/favicon.png
diff --git a/routing-in-play/public/javascripts/hello.js b/play-framework/routing-in-play/public/javascripts/hello.js
similarity index 100%
rename from routing-in-play/public/javascripts/hello.js
rename to play-framework/routing-in-play/public/javascripts/hello.js
diff --git a/routing-in-play/public/stylesheets/main.css b/play-framework/routing-in-play/public/stylesheets/main.css
similarity index 100%
rename from routing-in-play/public/stylesheets/main.css
rename to play-framework/routing-in-play/public/stylesheets/main.css
diff --git a/routing-in-play/test/ApplicationTest.java b/play-framework/routing-in-play/test/ApplicationTest.java
similarity index 100%
rename from routing-in-play/test/ApplicationTest.java
rename to play-framework/routing-in-play/test/ApplicationTest.java
diff --git a/routing-in-play/test/IntegrationTest.java b/play-framework/routing-in-play/test/IntegrationTest.java
similarity index 100%
rename from routing-in-play/test/IntegrationTest.java
rename to play-framework/routing-in-play/test/IntegrationTest.java