diff --git a/web-modules/play-framework/README.md b/web-modules/play-modules/README.md
similarity index 100%
rename from web-modules/play-framework/README.md
rename to web-modules/play-modules/README.md
diff --git a/web-modules/play-framework/async-http/.g8/form/app/controllers/$model__Camel$Controller.java b/web-modules/play-modules/async-http/.g8/form/app/controllers/$model__Camel$Controller.java
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/app/controllers/$model__Camel$Controller.java
rename to web-modules/play-modules/async-http/.g8/form/app/controllers/$model__Camel$Controller.java
diff --git a/web-modules/play-framework/async-http/.g8/form/app/controllers/$model__Camel$Data.java b/web-modules/play-modules/async-http/.g8/form/app/controllers/$model__Camel$Data.java
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/app/controllers/$model__Camel$Data.java
rename to web-modules/play-modules/async-http/.g8/form/app/controllers/$model__Camel$Data.java
diff --git a/web-modules/play-framework/async-http/.g8/form/app/views/$model__camel$/form.scala.html b/web-modules/play-modules/async-http/.g8/form/app/views/$model__camel$/form.scala.html
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/app/views/$model__camel$/form.scala.html
rename to web-modules/play-modules/async-http/.g8/form/app/views/$model__camel$/form.scala.html
diff --git a/web-modules/play-framework/async-http/.g8/form/default.properties b/web-modules/play-modules/async-http/.g8/form/default.properties
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/default.properties
rename to web-modules/play-modules/async-http/.g8/form/default.properties
diff --git a/web-modules/play-framework/async-http/.g8/form/generated-test/README.md b/web-modules/play-modules/async-http/.g8/form/generated-test/README.md
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/generated-test/README.md
rename to web-modules/play-modules/async-http/.g8/form/generated-test/README.md
diff --git a/web-modules/play-framework/async-http/.g8/form/generated-test/controllers/$model__Camel$ControllerTest.java b/web-modules/play-modules/async-http/.g8/form/generated-test/controllers/$model__Camel$ControllerTest.java
similarity index 100%
rename from web-modules/play-framework/async-http/.g8/form/generated-test/controllers/$model__Camel$ControllerTest.java
rename to web-modules/play-modules/async-http/.g8/form/generated-test/controllers/$model__Camel$ControllerTest.java
diff --git a/web-modules/play-framework/async-http/.gitignore b/web-modules/play-modules/async-http/.gitignore
similarity index 100%
rename from web-modules/play-framework/async-http/.gitignore
rename to web-modules/play-modules/async-http/.gitignore
diff --git a/web-modules/play-framework/async-http/README.md b/web-modules/play-modules/async-http/README.md
similarity index 100%
rename from web-modules/play-framework/async-http/README.md
rename to web-modules/play-modules/async-http/README.md
diff --git a/web-modules/play-framework/async-http/app/controllers/HomeController.java b/web-modules/play-modules/async-http/app/controllers/HomeController.java
similarity index 100%
rename from web-modules/play-framework/async-http/app/controllers/HomeController.java
rename to web-modules/play-modules/async-http/app/controllers/HomeController.java
diff --git a/web-modules/play-framework/async-http/app/views/index.scala.html b/web-modules/play-modules/async-http/app/views/index.scala.html
similarity index 100%
rename from web-modules/play-framework/async-http/app/views/index.scala.html
rename to web-modules/play-modules/async-http/app/views/index.scala.html
diff --git a/web-modules/play-framework/async-http/app/views/main.scala.html b/web-modules/play-modules/async-http/app/views/main.scala.html
similarity index 100%
rename from web-modules/play-framework/async-http/app/views/main.scala.html
rename to web-modules/play-modules/async-http/app/views/main.scala.html
diff --git a/web-modules/play-framework/async-http/build.sbt b/web-modules/play-modules/async-http/build.sbt
similarity index 100%
rename from web-modules/play-framework/async-http/build.sbt
rename to web-modules/play-modules/async-http/build.sbt
diff --git a/web-modules/play-framework/async-http/conf/application.conf b/web-modules/play-modules/async-http/conf/application.conf
similarity index 100%
rename from web-modules/play-framework/async-http/conf/application.conf
rename to web-modules/play-modules/async-http/conf/application.conf
diff --git a/web-modules/play-framework/async-http/conf/logback.xml b/web-modules/play-modules/async-http/conf/logback.xml
similarity index 100%
rename from web-modules/play-framework/async-http/conf/logback.xml
rename to web-modules/play-modules/async-http/conf/logback.xml
diff --git a/web-modules/play-framework/async-http/conf/routes b/web-modules/play-modules/async-http/conf/routes
similarity index 100%
rename from web-modules/play-framework/async-http/conf/routes
rename to web-modules/play-modules/async-http/conf/routes
diff --git a/web-modules/play-framework/async-http/project/build.properties b/web-modules/play-modules/async-http/project/build.properties
similarity index 100%
rename from web-modules/play-framework/async-http/project/build.properties
rename to web-modules/play-modules/async-http/project/build.properties
diff --git a/web-modules/play-framework/async-http/project/plugins.sbt b/web-modules/play-modules/async-http/project/plugins.sbt
similarity index 100%
rename from web-modules/play-framework/async-http/project/plugins.sbt
rename to web-modules/play-modules/async-http/project/plugins.sbt
diff --git a/web-modules/play-framework/async-http/public/images/favicon.png b/web-modules/play-modules/async-http/public/images/favicon.png
similarity index 100%
rename from web-modules/play-framework/async-http/public/images/favicon.png
rename to web-modules/play-modules/async-http/public/images/favicon.png
diff --git a/web-modules/play-framework/async-http/public/javascripts/main.js b/web-modules/play-modules/async-http/public/javascripts/main.js
similarity index 100%
rename from web-modules/play-framework/async-http/public/javascripts/main.js
rename to web-modules/play-modules/async-http/public/javascripts/main.js
diff --git a/web-modules/play-framework/async-http/public/stylesheets/main.css b/web-modules/play-modules/async-http/public/stylesheets/main.css
similarity index 100%
rename from web-modules/play-framework/async-http/public/stylesheets/main.css
rename to web-modules/play-modules/async-http/public/stylesheets/main.css
diff --git a/web-modules/play-framework/async-http/test/controllers/HomeControllerTest.java b/web-modules/play-modules/async-http/test/controllers/HomeControllerTest.java
similarity index 100%
rename from web-modules/play-framework/async-http/test/controllers/HomeControllerTest.java
rename to web-modules/play-modules/async-http/test/controllers/HomeControllerTest.java
diff --git a/web-modules/play-framework/introduction/.gitignore b/web-modules/play-modules/introduction/.gitignore
similarity index 100%
rename from web-modules/play-framework/introduction/.gitignore
rename to web-modules/play-modules/introduction/.gitignore
diff --git a/web-modules/play-framework/introduction/app/controllers/HomeController.java b/web-modules/play-modules/introduction/app/controllers/HomeController.java
similarity index 100%
rename from web-modules/play-framework/introduction/app/controllers/HomeController.java
rename to web-modules/play-modules/introduction/app/controllers/HomeController.java
diff --git a/web-modules/play-framework/introduction/app/views/index.scala.html b/web-modules/play-modules/introduction/app/views/index.scala.html
similarity index 100%
rename from web-modules/play-framework/introduction/app/views/index.scala.html
rename to web-modules/play-modules/introduction/app/views/index.scala.html
diff --git a/web-modules/play-framework/introduction/app/views/main.scala.html b/web-modules/play-modules/introduction/app/views/main.scala.html
similarity index 100%
rename from web-modules/play-framework/introduction/app/views/main.scala.html
rename to web-modules/play-modules/introduction/app/views/main.scala.html
diff --git a/web-modules/play-framework/introduction/build.sbt b/web-modules/play-modules/introduction/build.sbt
similarity index 100%
rename from web-modules/play-framework/introduction/build.sbt
rename to web-modules/play-modules/introduction/build.sbt
diff --git a/web-modules/play-framework/introduction/conf/application.conf b/web-modules/play-modules/introduction/conf/application.conf
similarity index 100%
rename from web-modules/play-framework/introduction/conf/application.conf
rename to web-modules/play-modules/introduction/conf/application.conf
diff --git a/web-modules/play-framework/introduction/conf/logback.xml b/web-modules/play-modules/introduction/conf/logback.xml
similarity index 100%
rename from web-modules/play-framework/introduction/conf/logback.xml
rename to web-modules/play-modules/introduction/conf/logback.xml
diff --git a/web-modules/play-framework/introduction/conf/routes b/web-modules/play-modules/introduction/conf/routes
similarity index 100%
rename from web-modules/play-framework/introduction/conf/routes
rename to web-modules/play-modules/introduction/conf/routes
diff --git a/web-modules/play-framework/introduction/project/build.properties b/web-modules/play-modules/introduction/project/build.properties
similarity index 100%
rename from web-modules/play-framework/introduction/project/build.properties
rename to web-modules/play-modules/introduction/project/build.properties
diff --git a/web-modules/play-framework/introduction/project/plugins.sbt b/web-modules/play-modules/introduction/project/plugins.sbt
similarity index 100%
rename from web-modules/play-framework/introduction/project/plugins.sbt
rename to web-modules/play-modules/introduction/project/plugins.sbt
diff --git a/web-modules/play-framework/introduction/public/images/favicon.png b/web-modules/play-modules/introduction/public/images/favicon.png
similarity index 100%
rename from web-modules/play-framework/introduction/public/images/favicon.png
rename to web-modules/play-modules/introduction/public/images/favicon.png
diff --git a/web-modules/play-framework/introduction/public/javascripts/main.js b/web-modules/play-modules/introduction/public/javascripts/main.js
similarity index 100%
rename from web-modules/play-framework/introduction/public/javascripts/main.js
rename to web-modules/play-modules/introduction/public/javascripts/main.js
diff --git a/web-modules/play-framework/introduction/public/stylesheets/main.css b/web-modules/play-modules/introduction/public/stylesheets/main.css
similarity index 100%
rename from web-modules/play-framework/introduction/public/stylesheets/main.css
rename to web-modules/play-modules/introduction/public/stylesheets/main.css
diff --git a/web-modules/play-framework/introduction/test/controllers/HomeControllerUnitTest.java b/web-modules/play-modules/introduction/test/controllers/HomeControllerUnitTest.java
similarity index 100%
rename from web-modules/play-framework/introduction/test/controllers/HomeControllerUnitTest.java
rename to web-modules/play-modules/introduction/test/controllers/HomeControllerUnitTest.java
diff --git a/web-modules/play-framework/routing-in-play/app/controllers/HomeController.java b/web-modules/play-modules/routing-in-play/app/controllers/HomeController.java
similarity index 100%
rename from web-modules/play-framework/routing-in-play/app/controllers/HomeController.java
rename to web-modules/play-modules/routing-in-play/app/controllers/HomeController.java
diff --git a/web-modules/play-framework/routing-in-play/app/views/index.scala.html b/web-modules/play-modules/routing-in-play/app/views/index.scala.html
similarity index 100%
rename from web-modules/play-framework/routing-in-play/app/views/index.scala.html
rename to web-modules/play-modules/routing-in-play/app/views/index.scala.html
diff --git a/web-modules/play-framework/routing-in-play/app/views/main.scala.html b/web-modules/play-modules/routing-in-play/app/views/main.scala.html
similarity index 100%
rename from web-modules/play-framework/routing-in-play/app/views/main.scala.html
rename to web-modules/play-modules/routing-in-play/app/views/main.scala.html
diff --git a/web-modules/play-framework/routing-in-play/build.sbt b/web-modules/play-modules/routing-in-play/build.sbt
similarity index 100%
rename from web-modules/play-framework/routing-in-play/build.sbt
rename to web-modules/play-modules/routing-in-play/build.sbt
diff --git a/web-modules/play-framework/routing-in-play/conf/application.conf b/web-modules/play-modules/routing-in-play/conf/application.conf
similarity index 100%
rename from web-modules/play-framework/routing-in-play/conf/application.conf
rename to web-modules/play-modules/routing-in-play/conf/application.conf
diff --git a/web-modules/play-framework/routing-in-play/conf/logback.xml b/web-modules/play-modules/routing-in-play/conf/logback.xml
similarity index 100%
rename from web-modules/play-framework/routing-in-play/conf/logback.xml
rename to web-modules/play-modules/routing-in-play/conf/logback.xml
diff --git a/web-modules/play-framework/routing-in-play/conf/routes b/web-modules/play-modules/routing-in-play/conf/routes
similarity index 100%
rename from web-modules/play-framework/routing-in-play/conf/routes
rename to web-modules/play-modules/routing-in-play/conf/routes
diff --git a/web-modules/play-framework/routing-in-play/project/build.properties b/web-modules/play-modules/routing-in-play/project/build.properties
similarity index 100%
rename from web-modules/play-framework/routing-in-play/project/build.properties
rename to web-modules/play-modules/routing-in-play/project/build.properties
diff --git a/web-modules/play-framework/routing-in-play/project/plugins.sbt b/web-modules/play-modules/routing-in-play/project/plugins.sbt
similarity index 100%
rename from web-modules/play-framework/routing-in-play/project/plugins.sbt
rename to web-modules/play-modules/routing-in-play/project/plugins.sbt
diff --git a/web-modules/play-framework/routing-in-play/public/images/favicon.png b/web-modules/play-modules/routing-in-play/public/images/favicon.png
similarity index 100%
rename from web-modules/play-framework/routing-in-play/public/images/favicon.png
rename to web-modules/play-modules/routing-in-play/public/images/favicon.png
diff --git a/web-modules/play-framework/routing-in-play/public/javascripts/main.js b/web-modules/play-modules/routing-in-play/public/javascripts/main.js
similarity index 100%
rename from web-modules/play-framework/routing-in-play/public/javascripts/main.js
rename to web-modules/play-modules/routing-in-play/public/javascripts/main.js
diff --git a/web-modules/play-framework/routing-in-play/public/stylesheets/main.css b/web-modules/play-modules/routing-in-play/public/stylesheets/main.css
similarity index 100%
rename from web-modules/play-framework/routing-in-play/public/stylesheets/main.css
rename to web-modules/play-modules/routing-in-play/public/stylesheets/main.css
diff --git a/web-modules/play-framework/routing-in-play/test/controllers/HomeControllerUnitTest.java b/web-modules/play-modules/routing-in-play/test/controllers/HomeControllerUnitTest.java
similarity index 100%
rename from web-modules/play-framework/routing-in-play/test/controllers/HomeControllerUnitTest.java
rename to web-modules/play-modules/routing-in-play/test/controllers/HomeControllerUnitTest.java
diff --git a/web-modules/play-framework/student-api/.gitignore b/web-modules/play-modules/student-api/.gitignore
similarity index 100%
rename from web-modules/play-framework/student-api/.gitignore
rename to web-modules/play-modules/student-api/.gitignore
diff --git a/web-modules/play-framework/student-api/app/controllers/StudentController.java b/web-modules/play-modules/student-api/app/controllers/StudentController.java
similarity index 100%
rename from web-modules/play-framework/student-api/app/controllers/StudentController.java
rename to web-modules/play-modules/student-api/app/controllers/StudentController.java
diff --git a/web-modules/play-framework/student-api/app/model/Student.java b/web-modules/play-modules/student-api/app/model/Student.java
similarity index 100%
rename from web-modules/play-framework/student-api/app/model/Student.java
rename to web-modules/play-modules/student-api/app/model/Student.java
diff --git a/web-modules/play-framework/student-api/app/store/StudentStore.java b/web-modules/play-modules/student-api/app/store/StudentStore.java
similarity index 100%
rename from web-modules/play-framework/student-api/app/store/StudentStore.java
rename to web-modules/play-modules/student-api/app/store/StudentStore.java
diff --git a/web-modules/play-framework/student-api/app/utils/Util.java b/web-modules/play-modules/student-api/app/utils/Util.java
similarity index 100%
rename from web-modules/play-framework/student-api/app/utils/Util.java
rename to web-modules/play-modules/student-api/app/utils/Util.java
diff --git a/web-modules/play-framework/student-api/build.sbt b/web-modules/play-modules/student-api/build.sbt
similarity index 100%
rename from web-modules/play-framework/student-api/build.sbt
rename to web-modules/play-modules/student-api/build.sbt
diff --git a/web-modules/play-framework/student-api/conf/application.conf b/web-modules/play-modules/student-api/conf/application.conf
similarity index 100%
rename from web-modules/play-framework/student-api/conf/application.conf
rename to web-modules/play-modules/student-api/conf/application.conf
diff --git a/web-modules/play-framework/student-api/conf/logback.xml b/web-modules/play-modules/student-api/conf/logback.xml
similarity index 100%
rename from web-modules/play-framework/student-api/conf/logback.xml
rename to web-modules/play-modules/student-api/conf/logback.xml
diff --git a/web-modules/play-framework/student-api/conf/routes b/web-modules/play-modules/student-api/conf/routes
similarity index 100%
rename from web-modules/play-framework/student-api/conf/routes
rename to web-modules/play-modules/student-api/conf/routes
diff --git a/web-modules/play-framework/student-api/project/build.properties b/web-modules/play-modules/student-api/project/build.properties
similarity index 100%
rename from web-modules/play-framework/student-api/project/build.properties
rename to web-modules/play-modules/student-api/project/build.properties
diff --git a/web-modules/play-framework/student-api/project/plugins.sbt b/web-modules/play-modules/student-api/project/plugins.sbt
similarity index 100%
rename from web-modules/play-framework/student-api/project/plugins.sbt
rename to web-modules/play-modules/student-api/project/plugins.sbt
diff --git a/web-modules/play-framework/student-api/test/controllers/StudentControllerUnitTest.java b/web-modules/play-modules/student-api/test/controllers/StudentControllerUnitTest.java
similarity index 100%
rename from web-modules/play-framework/student-api/test/controllers/StudentControllerUnitTest.java
rename to web-modules/play-modules/student-api/test/controllers/StudentControllerUnitTest.java
diff --git a/web-modules/play-framework/websockets/README.md b/web-modules/play-modules/websockets/README.md
similarity index 100%
rename from web-modules/play-framework/websockets/README.md
rename to web-modules/play-modules/websockets/README.md
diff --git a/web-modules/play-framework/websockets/app/actors/Messenger.java b/web-modules/play-modules/websockets/app/actors/Messenger.java
similarity index 100%
rename from web-modules/play-framework/websockets/app/actors/Messenger.java
rename to web-modules/play-modules/websockets/app/actors/Messenger.java
diff --git a/web-modules/play-framework/websockets/app/controllers/HomeController.java b/web-modules/play-modules/websockets/app/controllers/HomeController.java
similarity index 100%
rename from web-modules/play-framework/websockets/app/controllers/HomeController.java
rename to web-modules/play-modules/websockets/app/controllers/HomeController.java
diff --git a/web-modules/play-framework/websockets/app/dto/MessageDTO.java b/web-modules/play-modules/websockets/app/dto/MessageDTO.java
similarity index 100%
rename from web-modules/play-framework/websockets/app/dto/MessageDTO.java
rename to web-modules/play-modules/websockets/app/dto/MessageDTO.java
diff --git a/web-modules/play-framework/websockets/app/dto/RequestDTO.java b/web-modules/play-modules/websockets/app/dto/RequestDTO.java
similarity index 100%
rename from web-modules/play-framework/websockets/app/dto/RequestDTO.java
rename to web-modules/play-modules/websockets/app/dto/RequestDTO.java
diff --git a/web-modules/play-framework/websockets/app/utils/MessageConverter.java b/web-modules/play-modules/websockets/app/utils/MessageConverter.java
similarity index 100%
rename from web-modules/play-framework/websockets/app/utils/MessageConverter.java
rename to web-modules/play-modules/websockets/app/utils/MessageConverter.java
diff --git a/web-modules/play-framework/websockets/app/views/index.scala.html b/web-modules/play-modules/websockets/app/views/index.scala.html
similarity index 100%
rename from web-modules/play-framework/websockets/app/views/index.scala.html
rename to web-modules/play-modules/websockets/app/views/index.scala.html
diff --git a/web-modules/play-framework/websockets/app/views/main.scala.html b/web-modules/play-modules/websockets/app/views/main.scala.html
similarity index 100%
rename from web-modules/play-framework/websockets/app/views/main.scala.html
rename to web-modules/play-modules/websockets/app/views/main.scala.html
diff --git a/web-modules/play-framework/websockets/build.sbt b/web-modules/play-modules/websockets/build.sbt
similarity index 100%
rename from web-modules/play-framework/websockets/build.sbt
rename to web-modules/play-modules/websockets/build.sbt
diff --git a/web-modules/play-framework/websockets/conf/application.conf b/web-modules/play-modules/websockets/conf/application.conf
similarity index 100%
rename from web-modules/play-framework/websockets/conf/application.conf
rename to web-modules/play-modules/websockets/conf/application.conf
diff --git a/web-modules/play-framework/websockets/conf/logback.xml b/web-modules/play-modules/websockets/conf/logback.xml
similarity index 100%
rename from web-modules/play-framework/websockets/conf/logback.xml
rename to web-modules/play-modules/websockets/conf/logback.xml
diff --git a/web-modules/play-framework/websockets/conf/routes b/web-modules/play-modules/websockets/conf/routes
similarity index 100%
rename from web-modules/play-framework/websockets/conf/routes
rename to web-modules/play-modules/websockets/conf/routes
diff --git a/web-modules/play-framework/websockets/project/build.properties b/web-modules/play-modules/websockets/project/build.properties
similarity index 100%
rename from web-modules/play-framework/websockets/project/build.properties
rename to web-modules/play-modules/websockets/project/build.properties
diff --git a/web-modules/play-framework/websockets/project/plugins.sbt b/web-modules/play-modules/websockets/project/plugins.sbt
similarity index 100%
rename from web-modules/play-framework/websockets/project/plugins.sbt
rename to web-modules/play-modules/websockets/project/plugins.sbt
diff --git a/web-modules/play-framework/websockets/public/images/favicon.png b/web-modules/play-modules/websockets/public/images/favicon.png
similarity index 100%
rename from web-modules/play-framework/websockets/public/images/favicon.png
rename to web-modules/play-modules/websockets/public/images/favicon.png
diff --git a/web-modules/play-framework/websockets/public/javascripts/main.js b/web-modules/play-modules/websockets/public/javascripts/main.js
similarity index 100%
rename from web-modules/play-framework/websockets/public/javascripts/main.js
rename to web-modules/play-modules/websockets/public/javascripts/main.js
diff --git a/web-modules/play-framework/websockets/public/stylesheets/main.css b/web-modules/play-modules/websockets/public/stylesheets/main.css
similarity index 100%
rename from web-modules/play-framework/websockets/public/stylesheets/main.css
rename to web-modules/play-modules/websockets/public/stylesheets/main.css
diff --git a/web-modules/play-framework/websockets/test/controllers/HomeControllerTest.java b/web-modules/play-modules/websockets/test/controllers/HomeControllerTest.java
similarity index 100%
rename from web-modules/play-framework/websockets/test/controllers/HomeControllerTest.java
rename to web-modules/play-modules/websockets/test/controllers/HomeControllerTest.java
diff --git a/web-modules/pom.xml b/web-modules/pom.xml
index 2bae109d0d..50ae8cbf26 100644
--- a/web-modules/pom.xml
+++ b/web-modules/pom.xml
@@ -27,7 +27,7 @@
         <module>jooby</module>
         <module>linkrest</module>
         <module>ninja</module>
-        <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+        <!-- <module>play-modules</module> --> <!-- Not a maven project -->
         <!-- <module>raml-modules</module> --> <!-- Not a maven project -->
         <module>ratpack</module>
         <module>resteasy</module>