diff --git a/pom.xml b/pom.xml
index 7bbf90725f..6b1ed206bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>parent-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-  <name>parent-modules</name>
+    <name>parent-modules</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -475,13 +475,11 @@
                 <module>pdf</module>
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
                 <module>protobuffer</module>
 
                 <module>quarkus-modules</module>
 
                 <module>rabbitmq</module>
-                <!-- <module>raml</module> --> <!-- Not a maven project -->
                 <module>reactor-core</module>
                 <module>rsocket</module>
                 <module>rule-engines</module>
@@ -880,13 +878,11 @@
                 <module>pdf</module>
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
                 <module>protobuffer</module>
 
                 <module>quarkus-modules</module>
 
                 <module>rabbitmq</module>
-                <!-- <module>raml</module> --> <!-- Not a maven project -->
                 <module>reactor-core</module>
                 <module>rsocket</module>
                 <module>rule-engines</module>
diff --git a/web-modules/pom.xml b/web-modules/pom.xml
index a6e13cbb2a..2bae109d0d 100644
--- a/web-modules/pom.xml
+++ b/web-modules/pom.xml
@@ -27,6 +27,8 @@
         <module>jooby</module>
         <module>linkrest</module>
         <module>ninja</module>
+        <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+        <!-- <module>raml-modules</module> --> <!-- Not a maven project -->
         <module>ratpack</module>
         <module>resteasy</module>
         <module>restx</module>
diff --git a/web-modules/raml/README.md b/web-modules/raml-modules/README.md
similarity index 100%
rename from web-modules/raml/README.md
rename to web-modules/raml-modules/README.md
diff --git a/web-modules/raml/annotations/README.md b/web-modules/raml-modules/annotations/README.md
similarity index 100%
rename from web-modules/raml/annotations/README.md
rename to web-modules/raml-modules/annotations/README.md
diff --git a/web-modules/raml/annotations/api.raml b/web-modules/raml-modules/annotations/api.raml
similarity index 100%
rename from web-modules/raml/annotations/api.raml
rename to web-modules/raml-modules/annotations/api.raml
diff --git a/web-modules/raml/annotations/examples/Bar.json b/web-modules/raml-modules/annotations/examples/Bar.json
similarity index 100%
rename from web-modules/raml/annotations/examples/Bar.json
rename to web-modules/raml-modules/annotations/examples/Bar.json
diff --git a/web-modules/raml/annotations/examples/Bars.json b/web-modules/raml-modules/annotations/examples/Bars.json
similarity index 100%
rename from web-modules/raml/annotations/examples/Bars.json
rename to web-modules/raml-modules/annotations/examples/Bars.json
diff --git a/web-modules/raml/annotations/examples/Error.json b/web-modules/raml-modules/annotations/examples/Error.json
similarity index 100%
rename from web-modules/raml/annotations/examples/Error.json
rename to web-modules/raml-modules/annotations/examples/Error.json
diff --git a/web-modules/raml/annotations/examples/Foo.json b/web-modules/raml-modules/annotations/examples/Foo.json
similarity index 100%
rename from web-modules/raml/annotations/examples/Foo.json
rename to web-modules/raml-modules/annotations/examples/Foo.json
diff --git a/web-modules/raml/annotations/examples/Foos.json b/web-modules/raml-modules/annotations/examples/Foos.json
similarity index 100%
rename from web-modules/raml/annotations/examples/Foos.json
rename to web-modules/raml-modules/annotations/examples/Foos.json
diff --git a/web-modules/raml/annotations/extensions/en_US/additionalResources.raml b/web-modules/raml-modules/annotations/extensions/en_US/additionalResources.raml
similarity index 100%
rename from web-modules/raml/annotations/extensions/en_US/additionalResources.raml
rename to web-modules/raml-modules/annotations/extensions/en_US/additionalResources.raml
diff --git a/web-modules/raml/annotations/libraries/dataTypes.raml b/web-modules/raml-modules/annotations/libraries/dataTypes.raml
similarity index 100%
rename from web-modules/raml/annotations/libraries/dataTypes.raml
rename to web-modules/raml-modules/annotations/libraries/dataTypes.raml
diff --git a/web-modules/raml/annotations/libraries/resourceTypes.raml b/web-modules/raml-modules/annotations/libraries/resourceTypes.raml
similarity index 100%
rename from web-modules/raml/annotations/libraries/resourceTypes.raml
rename to web-modules/raml-modules/annotations/libraries/resourceTypes.raml
diff --git a/web-modules/raml/annotations/libraries/securitySchemes.raml b/web-modules/raml-modules/annotations/libraries/securitySchemes.raml
similarity index 100%
rename from web-modules/raml/annotations/libraries/securitySchemes.raml
rename to web-modules/raml-modules/annotations/libraries/securitySchemes.raml
diff --git a/web-modules/raml/annotations/libraries/traits.raml b/web-modules/raml-modules/annotations/libraries/traits.raml
similarity index 100%
rename from web-modules/raml/annotations/libraries/traits.raml
rename to web-modules/raml-modules/annotations/libraries/traits.raml
diff --git a/web-modules/raml/annotations/overlays/es_ES/additionalResources.raml b/web-modules/raml-modules/annotations/overlays/es_ES/additionalResources.raml
similarity index 100%
rename from web-modules/raml/annotations/overlays/es_ES/additionalResources.raml
rename to web-modules/raml-modules/annotations/overlays/es_ES/additionalResources.raml
diff --git a/web-modules/raml/annotations/overlays/es_ES/documentationItems.raml b/web-modules/raml-modules/annotations/overlays/es_ES/documentationItems.raml
similarity index 100%
rename from web-modules/raml/annotations/overlays/es_ES/documentationItems.raml
rename to web-modules/raml-modules/annotations/overlays/es_ES/documentationItems.raml
diff --git a/web-modules/raml/introduction/0.8/api.raml b/web-modules/raml-modules/introduction/0.8/api.raml
similarity index 100%
rename from web-modules/raml/introduction/0.8/api.raml
rename to web-modules/raml-modules/introduction/0.8/api.raml
diff --git a/web-modules/raml/introduction/0.8/error-example.json b/web-modules/raml-modules/introduction/0.8/error-example.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/error-example.json
rename to web-modules/raml-modules/introduction/0.8/error-example.json
diff --git a/web-modules/raml/introduction/0.8/error.json b/web-modules/raml-modules/introduction/0.8/error.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/error.json
rename to web-modules/raml-modules/introduction/0.8/error.json
diff --git a/web-modules/raml/introduction/0.8/foo-example.json b/web-modules/raml-modules/introduction/0.8/foo-example.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/foo-example.json
rename to web-modules/raml-modules/introduction/0.8/foo-example.json
diff --git a/web-modules/raml/introduction/0.8/foo.json b/web-modules/raml-modules/introduction/0.8/foo.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/foo.json
rename to web-modules/raml-modules/introduction/0.8/foo.json
diff --git a/web-modules/raml/introduction/0.8/foos-example.json b/web-modules/raml-modules/introduction/0.8/foos-example.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/foos-example.json
rename to web-modules/raml-modules/introduction/0.8/foos-example.json
diff --git a/web-modules/raml/introduction/0.8/foos.json b/web-modules/raml-modules/introduction/0.8/foos.json
similarity index 100%
rename from web-modules/raml/introduction/0.8/foos.json
rename to web-modules/raml-modules/introduction/0.8/foos.json
diff --git a/web-modules/raml/introduction/1.0/api.raml b/web-modules/raml-modules/introduction/1.0/api.raml
similarity index 100%
rename from web-modules/raml/introduction/1.0/api.raml
rename to web-modules/raml-modules/introduction/1.0/api.raml
diff --git a/web-modules/raml/introduction/1.0/examples/Error.json b/web-modules/raml-modules/introduction/1.0/examples/Error.json
similarity index 100%
rename from web-modules/raml/introduction/1.0/examples/Error.json
rename to web-modules/raml-modules/introduction/1.0/examples/Error.json
diff --git a/web-modules/raml/introduction/1.0/examples/Foo.json b/web-modules/raml-modules/introduction/1.0/examples/Foo.json
similarity index 100%
rename from web-modules/raml/introduction/1.0/examples/Foo.json
rename to web-modules/raml-modules/introduction/1.0/examples/Foo.json
diff --git a/web-modules/raml/introduction/1.0/examples/Foos.json b/web-modules/raml-modules/introduction/1.0/examples/Foos.json
similarity index 100%
rename from web-modules/raml/introduction/1.0/examples/Foos.json
rename to web-modules/raml-modules/introduction/1.0/examples/Foos.json
diff --git a/web-modules/raml/introduction/1.0/types/Error.raml b/web-modules/raml-modules/introduction/1.0/types/Error.raml
similarity index 100%
rename from web-modules/raml/introduction/1.0/types/Error.raml
rename to web-modules/raml-modules/introduction/1.0/types/Error.raml
diff --git a/web-modules/raml/introduction/1.0/types/Foo.raml b/web-modules/raml-modules/introduction/1.0/types/Foo.raml
similarity index 100%
rename from web-modules/raml/introduction/1.0/types/Foo.raml
rename to web-modules/raml-modules/introduction/1.0/types/Foo.raml
diff --git a/web-modules/raml/modularization/README.md b/web-modules/raml-modules/modularization/README.md
similarity index 100%
rename from web-modules/raml/modularization/README.md
rename to web-modules/raml-modules/modularization/README.md
diff --git a/web-modules/raml/modularization/api-before-modularization.raml b/web-modules/raml-modules/modularization/api-before-modularization.raml
similarity index 100%
rename from web-modules/raml/modularization/api-before-modularization.raml
rename to web-modules/raml-modules/modularization/api-before-modularization.raml
diff --git a/web-modules/raml/modularization/api-with-libraries.raml b/web-modules/raml-modules/modularization/api-with-libraries.raml
similarity index 100%
rename from web-modules/raml/modularization/api-with-libraries.raml
rename to web-modules/raml-modules/modularization/api-with-libraries.raml
diff --git a/web-modules/raml/modularization/api-with-typed-fragments.raml b/web-modules/raml-modules/modularization/api-with-typed-fragments.raml
similarity index 100%
rename from web-modules/raml/modularization/api-with-typed-fragments.raml
rename to web-modules/raml-modules/modularization/api-with-typed-fragments.raml
diff --git a/web-modules/raml/modularization/api.raml b/web-modules/raml-modules/modularization/api.raml
similarity index 100%
rename from web-modules/raml/modularization/api.raml
rename to web-modules/raml-modules/modularization/api.raml
diff --git a/web-modules/raml/modularization/examples/Bar.json b/web-modules/raml-modules/modularization/examples/Bar.json
similarity index 100%
rename from web-modules/raml/modularization/examples/Bar.json
rename to web-modules/raml-modules/modularization/examples/Bar.json
diff --git a/web-modules/raml/modularization/examples/Bars.json b/web-modules/raml-modules/modularization/examples/Bars.json
similarity index 100%
rename from web-modules/raml/modularization/examples/Bars.json
rename to web-modules/raml-modules/modularization/examples/Bars.json
diff --git a/web-modules/raml/modularization/examples/Error.json b/web-modules/raml-modules/modularization/examples/Error.json
similarity index 100%
rename from web-modules/raml/modularization/examples/Error.json
rename to web-modules/raml-modules/modularization/examples/Error.json
diff --git a/web-modules/raml/modularization/examples/Foo.json b/web-modules/raml-modules/modularization/examples/Foo.json
similarity index 100%
rename from web-modules/raml/modularization/examples/Foo.json
rename to web-modules/raml-modules/modularization/examples/Foo.json
diff --git a/web-modules/raml/modularization/examples/Foos.json b/web-modules/raml-modules/modularization/examples/Foos.json
similarity index 100%
rename from web-modules/raml/modularization/examples/Foos.json
rename to web-modules/raml-modules/modularization/examples/Foos.json
diff --git a/web-modules/raml/modularization/extensions/en_US/additionalResources.raml b/web-modules/raml-modules/modularization/extensions/en_US/additionalResources.raml
similarity index 100%
rename from web-modules/raml/modularization/extensions/en_US/additionalResources.raml
rename to web-modules/raml-modules/modularization/extensions/en_US/additionalResources.raml
diff --git a/web-modules/raml/modularization/libraries/dataTypes.raml b/web-modules/raml-modules/modularization/libraries/dataTypes.raml
similarity index 100%
rename from web-modules/raml/modularization/libraries/dataTypes.raml
rename to web-modules/raml-modules/modularization/libraries/dataTypes.raml
diff --git a/web-modules/raml/modularization/libraries/resourceTypes.raml b/web-modules/raml-modules/modularization/libraries/resourceTypes.raml
similarity index 100%
rename from web-modules/raml/modularization/libraries/resourceTypes.raml
rename to web-modules/raml-modules/modularization/libraries/resourceTypes.raml
diff --git a/web-modules/raml/modularization/libraries/securitySchemes.raml b/web-modules/raml-modules/modularization/libraries/securitySchemes.raml
similarity index 100%
rename from web-modules/raml/modularization/libraries/securitySchemes.raml
rename to web-modules/raml-modules/modularization/libraries/securitySchemes.raml
diff --git a/web-modules/raml/modularization/libraries/traits.raml b/web-modules/raml-modules/modularization/libraries/traits.raml
similarity index 100%
rename from web-modules/raml/modularization/libraries/traits.raml
rename to web-modules/raml-modules/modularization/libraries/traits.raml
diff --git a/web-modules/raml/modularization/overlays/es_ES/additionalResources.raml b/web-modules/raml-modules/modularization/overlays/es_ES/additionalResources.raml
similarity index 100%
rename from web-modules/raml/modularization/overlays/es_ES/additionalResources.raml
rename to web-modules/raml-modules/modularization/overlays/es_ES/additionalResources.raml
diff --git a/web-modules/raml/modularization/overlays/es_ES/documentationItems.raml b/web-modules/raml-modules/modularization/overlays/es_ES/documentationItems.raml
similarity index 100%
rename from web-modules/raml/modularization/overlays/es_ES/documentationItems.raml
rename to web-modules/raml-modules/modularization/overlays/es_ES/documentationItems.raml
diff --git a/web-modules/raml/modularization/resourceTypes/collection.raml b/web-modules/raml-modules/modularization/resourceTypes/collection.raml
similarity index 100%
rename from web-modules/raml/modularization/resourceTypes/collection.raml
rename to web-modules/raml-modules/modularization/resourceTypes/collection.raml
diff --git a/web-modules/raml/modularization/resourceTypes/item.raml b/web-modules/raml-modules/modularization/resourceTypes/item.raml
similarity index 100%
rename from web-modules/raml/modularization/resourceTypes/item.raml
rename to web-modules/raml-modules/modularization/resourceTypes/item.raml
diff --git a/web-modules/raml/modularization/traits/hasNotFound.raml b/web-modules/raml-modules/modularization/traits/hasNotFound.raml
similarity index 100%
rename from web-modules/raml/modularization/traits/hasNotFound.raml
rename to web-modules/raml-modules/modularization/traits/hasNotFound.raml
diff --git a/web-modules/raml/modularization/traits/hasRequestItem.raml b/web-modules/raml-modules/modularization/traits/hasRequestItem.raml
similarity index 100%
rename from web-modules/raml/modularization/traits/hasRequestItem.raml
rename to web-modules/raml-modules/modularization/traits/hasRequestItem.raml
diff --git a/web-modules/raml/modularization/traits/hasResponseCollection.raml b/web-modules/raml-modules/modularization/traits/hasResponseCollection.raml
similarity index 100%
rename from web-modules/raml/modularization/traits/hasResponseCollection.raml
rename to web-modules/raml-modules/modularization/traits/hasResponseCollection.raml
diff --git a/web-modules/raml/modularization/traits/hasResponseItem.raml b/web-modules/raml-modules/modularization/traits/hasResponseItem.raml
similarity index 100%
rename from web-modules/raml/modularization/traits/hasResponseItem.raml
rename to web-modules/raml-modules/modularization/traits/hasResponseItem.raml
diff --git a/web-modules/raml/modularization/types/Bar.raml b/web-modules/raml-modules/modularization/types/Bar.raml
similarity index 100%
rename from web-modules/raml/modularization/types/Bar.raml
rename to web-modules/raml-modules/modularization/types/Bar.raml
diff --git a/web-modules/raml/modularization/types/Error.raml b/web-modules/raml-modules/modularization/types/Error.raml
similarity index 100%
rename from web-modules/raml/modularization/types/Error.raml
rename to web-modules/raml-modules/modularization/types/Error.raml
diff --git a/web-modules/raml/modularization/types/Foo.raml b/web-modules/raml-modules/modularization/types/Foo.raml
similarity index 100%
rename from web-modules/raml/modularization/types/Foo.raml
rename to web-modules/raml-modules/modularization/types/Foo.raml
diff --git a/web-modules/raml/resource-types-and-traits/README.md b/web-modules/raml-modules/resource-types-and-traits/README.md
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/README.md
rename to web-modules/raml-modules/resource-types-and-traits/README.md
diff --git a/web-modules/raml/resource-types-and-traits/api-before-resource-types-and-traits.raml b/web-modules/raml-modules/resource-types-and-traits/api-before-resource-types-and-traits.raml
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/api-before-resource-types-and-traits.raml
rename to web-modules/raml-modules/resource-types-and-traits/api-before-resource-types-and-traits.raml
diff --git a/web-modules/raml/resource-types-and-traits/api.raml b/web-modules/raml-modules/resource-types-and-traits/api.raml
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/api.raml
rename to web-modules/raml-modules/resource-types-and-traits/api.raml
diff --git a/web-modules/raml/resource-types-and-traits/examples/Bar.json b/web-modules/raml-modules/resource-types-and-traits/examples/Bar.json
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/examples/Bar.json
rename to web-modules/raml-modules/resource-types-and-traits/examples/Bar.json
diff --git a/web-modules/raml/resource-types-and-traits/examples/Bars.json b/web-modules/raml-modules/resource-types-and-traits/examples/Bars.json
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/examples/Bars.json
rename to web-modules/raml-modules/resource-types-and-traits/examples/Bars.json
diff --git a/web-modules/raml/resource-types-and-traits/examples/Error.json b/web-modules/raml-modules/resource-types-and-traits/examples/Error.json
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/examples/Error.json
rename to web-modules/raml-modules/resource-types-and-traits/examples/Error.json
diff --git a/web-modules/raml/resource-types-and-traits/examples/Foo.json b/web-modules/raml-modules/resource-types-and-traits/examples/Foo.json
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/examples/Foo.json
rename to web-modules/raml-modules/resource-types-and-traits/examples/Foo.json
diff --git a/web-modules/raml/resource-types-and-traits/examples/Foos.json b/web-modules/raml-modules/resource-types-and-traits/examples/Foos.json
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/examples/Foos.json
rename to web-modules/raml-modules/resource-types-and-traits/examples/Foos.json
diff --git a/web-modules/raml/resource-types-and-traits/types/Bar.raml b/web-modules/raml-modules/resource-types-and-traits/types/Bar.raml
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/types/Bar.raml
rename to web-modules/raml-modules/resource-types-and-traits/types/Bar.raml
diff --git a/web-modules/raml/resource-types-and-traits/types/Error.raml b/web-modules/raml-modules/resource-types-and-traits/types/Error.raml
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/types/Error.raml
rename to web-modules/raml-modules/resource-types-and-traits/types/Error.raml
diff --git a/web-modules/raml/resource-types-and-traits/types/Foo.raml b/web-modules/raml-modules/resource-types-and-traits/types/Foo.raml
similarity index 100%
rename from web-modules/raml/resource-types-and-traits/types/Foo.raml
rename to web-modules/raml-modules/resource-types-and-traits/types/Foo.raml