diff --git a/maven-all/README.md b/maven-all/README.md
new file mode 100644
index 0000000000..d014f323d2
--- /dev/null
+++ b/maven-all/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Apache Maven Tutorial](https://www.baeldung.com/maven)
\ No newline at end of file
diff --git a/maven-all/compiler-plugin-java-9/README.md b/maven-all/compiler-plugin-java-9/README.md
new file mode 100644
index 0000000000..d0b7b72acc
--- /dev/null
+++ b/maven-all/compiler-plugin-java-9/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Maven Compiler Plugin](http://www.baeldung.com/maven-compiler-plugin)
\ No newline at end of file
diff --git a/maven/compiler-plugin-java-9/pom.xml b/maven-all/compiler-plugin-java-9/pom.xml
similarity index 100%
rename from maven/compiler-plugin-java-9/pom.xml
rename to maven-all/compiler-plugin-java-9/pom.xml
diff --git a/maven/compiler-plugin-java-9/src/main/java/com/baeldung/maven/java9/MavenCompilerPlugin.java b/maven-all/compiler-plugin-java-9/src/main/java/com/baeldung/maven/java9/MavenCompilerPlugin.java
similarity index 100%
rename from maven/compiler-plugin-java-9/src/main/java/com/baeldung/maven/java9/MavenCompilerPlugin.java
rename to maven-all/compiler-plugin-java-9/src/main/java/com/baeldung/maven/java9/MavenCompilerPlugin.java
diff --git a/maven/compiler-plugin-java-9/src/main/java/module-info.java b/maven-all/compiler-plugin-java-9/src/main/java/module-info.java
similarity index 100%
rename from maven/compiler-plugin-java-9/src/main/java/module-info.java
rename to maven-all/compiler-plugin-java-9/src/main/java/module-info.java
diff --git a/maven-all/maven-war-plugin/README.md b/maven-all/maven-war-plugin/README.md
new file mode 100644
index 0000000000..d559fea80b
--- /dev/null
+++ b/maven-all/maven-war-plugin/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Eclipse Error: web.xml is missing and failOnMissingWebXml is set to true](https://www.baeldung.com/eclipse-error-web-xml-missing)
\ No newline at end of file
diff --git a/maven/maven-war-plugin/pom.xml b/maven-all/maven-war-plugin/pom.xml
similarity index 89%
rename from maven/maven-war-plugin/pom.xml
rename to maven-all/maven-war-plugin/pom.xml
index 517c08978f..25c2e1ba1b 100644
--- a/maven/maven-war-plugin/pom.xml
+++ b/maven-all/maven-war-plugin/pom.xml
@@ -1,29 +1,29 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>maven-war-plugin-property</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <name>maven-war-plugin-property</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <!-- Update maven war plugin to 3.1.0 or higher -->
-                <version>3.1.0</version>
-                <configuration>
-                    <!-- Set failOnMissingWebXml configuration for maven war plugin -->
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <!-- Set failOnMissingWebXml as false in properties section -->
-    <properties>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-    </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>maven-war-plugin</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>war</packaging>
+    <name>maven-war-plugin</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <!-- Update maven war plugin to 3.1.0 or higher -->
+                <version>3.1.0</version>
+                <configuration>
+                    <!-- Set failOnMissingWebXml configuration for maven war plugin -->
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <!-- Set failOnMissingWebXml as false in properties section -->
+    <properties>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/maven/.gitignore b/maven-all/maven/.gitignore
similarity index 100%
rename from maven/.gitignore
rename to maven-all/maven/.gitignore
diff --git a/maven/README.md b/maven-all/maven/README.md
similarity index 70%
rename from maven/README.md
rename to maven-all/maven/README.md
index 6d1a7081b7..abe7fc4a80 100644
--- a/maven/README.md
+++ b/maven-all/maven/README.md
@@ -11,9 +11,4 @@
 - [Maven Project with Multiple Source Directories](https://www.baeldung.com/maven-project-multiple-src-directories)
 - [Integration Testing with Maven](https://www.baeldung.com/maven-integration-test)
 - [Apache Maven Standard Directory Layout](https://www.baeldung.com/maven-directory-structure)
-- [Apache Maven Tutorial](https://www.baeldung.com/maven)
-- [Use the Latest Version of a Dependency in Maven](https://www.baeldung.com/maven-dependency-latest-version)
 - [Multi-Module Project with Maven](https://www.baeldung.com/maven-multi-module)
-- [Maven Enforcer Plugin](https://www.baeldung.com/maven-enforcer-plugin)
-- [Eclipse Error: web.xml is missing and failOnMissingWebXml is set to true](https://www.baeldung.com/eclipse-error-web-xml-missing)
-- [Guide to Maven Profiles](https://www.baeldung.com/maven-profiles)
diff --git a/maven/custom-rule/pom.xml b/maven-all/maven/custom-rule/pom.xml
similarity index 100%
rename from maven/custom-rule/pom.xml
rename to maven-all/maven/custom-rule/pom.xml
diff --git a/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java b/maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
similarity index 100%
rename from maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
rename to maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java
diff --git a/maven/input-resources/baeldung.png b/maven-all/maven/input-resources/baeldung.png
similarity index 100%
rename from maven/input-resources/baeldung.png
rename to maven-all/maven/input-resources/baeldung.png
diff --git a/maven/input-resources/baeldung.txt b/maven-all/maven/input-resources/baeldung.txt
similarity index 100%
rename from maven/input-resources/baeldung.txt
rename to maven-all/maven/input-resources/baeldung.txt
diff --git a/maven/input-resources/verifications.xml b/maven-all/maven/input-resources/verifications.xml
similarity index 100%
rename from maven/input-resources/verifications.xml
rename to maven-all/maven/input-resources/verifications.xml
diff --git a/maven-all/maven/maven-enforcer/README.md b/maven-all/maven/maven-enforcer/README.md
new file mode 100644
index 0000000000..7515647a3d
--- /dev/null
+++ b/maven-all/maven/maven-enforcer/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Maven Enforcer Plugin](https://www.baeldung.com/maven-enforcer-plugin)
\ No newline at end of file
diff --git a/maven/maven-enforcer/pom.xml b/maven-all/maven/maven-enforcer/pom.xml
similarity index 100%
rename from maven/maven-enforcer/pom.xml
rename to maven-all/maven/maven-enforcer/pom.xml
diff --git a/maven/pom.xml b/maven-all/maven/pom.xml
similarity index 99%
rename from maven/pom.xml
rename to maven-all/maven/pom.xml
index ef6e7b7d93..d34be04fcf 100644
--- a/maven/pom.xml
+++ b/maven-all/maven/pom.xml
@@ -11,6 +11,7 @@
         <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <modules>
diff --git a/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java b/maven-all/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java
similarity index 100%
rename from maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java
rename to maven-all/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java
diff --git a/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java b/maven-all/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java
similarity index 100%
rename from maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java
rename to maven-all/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java
diff --git a/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java b/maven-all/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java
similarity index 100%
rename from maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java
rename to maven-all/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java
diff --git a/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java b/maven-all/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java
similarity index 100%
rename from maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java
rename to maven-all/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java
diff --git a/maven/src/main/java/com/baeldung/maven/plugins/Data.java b/maven-all/maven/src/main/java/com/baeldung/maven/plugins/Data.java
similarity index 100%
rename from maven/src/main/java/com/baeldung/maven/plugins/Data.java
rename to maven-all/maven/src/main/java/com/baeldung/maven/plugins/Data.java
diff --git a/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java b/maven-all/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java
similarity index 100%
rename from maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java
rename to maven-all/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java
diff --git a/maven/src/main/resources/logback.xml b/maven-all/maven/src/main/resources/logback.xml
similarity index 100%
rename from maven/src/main/resources/logback.xml
rename to maven-all/maven/src/main/resources/logback.xml
diff --git a/maven/src/main/webapp/WEB-INF/web.xml b/maven-all/maven/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from maven/src/main/webapp/WEB-INF/web.xml
rename to maven-all/maven/src/main/webapp/WEB-INF/web.xml
diff --git a/maven/src/test/java/com/baeldung/maven/it/Integration.java b/maven-all/maven/src/test/java/com/baeldung/maven/it/Integration.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/it/Integration.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/it/Integration.java
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestIT.java b/maven-all/maven/src/test/java/com/baeldung/maven/it/RestIT.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/it/RestIT.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/it/RestIT.java
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java b/maven-all/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java b/maven-all/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java
diff --git a/maven/src/test/java/com/baeldung/maven/plugins/DataCheck.java b/maven-all/maven/src/test/java/com/baeldung/maven/plugins/DataCheck.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/plugins/DataCheck.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/plugins/DataCheck.java
diff --git a/maven/src/test/java/com/baeldung/maven/plugins/DataUnitTest.java b/maven-all/maven/src/test/java/com/baeldung/maven/plugins/DataUnitTest.java
similarity index 100%
rename from maven/src/test/java/com/baeldung/maven/plugins/DataUnitTest.java
rename to maven-all/maven/src/test/java/com/baeldung/maven/plugins/DataUnitTest.java
diff --git a/maven/src/test/java/testfail/TestFail.java b/maven-all/maven/src/test/java/testfail/TestFail.java
similarity index 100%
rename from maven/src/test/java/testfail/TestFail.java
rename to maven-all/maven/src/test/java/testfail/TestFail.java
diff --git a/maven-all/profiles/README.md b/maven-all/profiles/README.md
new file mode 100644
index 0000000000..22d5d7f70c
--- /dev/null
+++ b/maven-all/profiles/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Guide to Maven Profiles](https://www.baeldung.com/maven-profiles)
\ No newline at end of file
diff --git a/maven/profiles/pom.xml b/maven-all/profiles/pom.xml
similarity index 100%
rename from maven/profiles/pom.xml
rename to maven-all/profiles/pom.xml
diff --git a/maven-all/versions-maven-plugin/README.md b/maven-all/versions-maven-plugin/README.md
new file mode 100644
index 0000000000..8f5670f802
--- /dev/null
+++ b/maven-all/versions-maven-plugin/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Use the Latest Version of a Dependency in Maven](https://www.baeldung.com/maven-dependency-latest-version)
\ No newline at end of file
diff --git a/maven/versions-maven-plugin/original/pom.xml b/maven-all/versions-maven-plugin/original/pom.xml
similarity index 100%
rename from maven/versions-maven-plugin/original/pom.xml
rename to maven-all/versions-maven-plugin/original/pom.xml
diff --git a/maven/versions-maven-plugin/pom.xml b/maven-all/versions-maven-plugin/pom.xml
similarity index 98%
rename from maven/versions-maven-plugin/pom.xml
rename to maven-all/versions-maven-plugin/pom.xml
index e0714bf0e0..c9f63a46f1 100644
--- a/maven/versions-maven-plugin/pom.xml
+++ b/maven-all/versions-maven-plugin/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <version>1.9.1</version>
         </dependency>
 
     </dependencies>
diff --git a/maven/versions-maven-plugin/run-the-demo.sh b/maven-all/versions-maven-plugin/run-the-demo.sh
old mode 100755
new mode 100644
similarity index 100%
rename from maven/versions-maven-plugin/run-the-demo.sh
rename to maven-all/versions-maven-plugin/run-the-demo.sh
diff --git a/pom.xml b/pom.xml
index 79e5194ee8..4f40f8261f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,7 +544,11 @@
 				<module>lucene</module>
 
 				<module>mapstruct</module>
-				<module>maven</module>
+				<!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
+				<module>maven-all/maven</module>
+				<module>maven-all/maven-war-plugin</module>
+				<module>maven-all/profiles</module>
+				<module>maven-all/versions-maven-plugin</module>
 				<module>maven-archetype</module>
 				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
 				<module>maven-polyglot/maven-polyglot-json-extension</module>
@@ -1279,7 +1283,11 @@
 				<module>lucene</module>
 
 				<module>mapstruct</module>
-				<module>maven</module>
+				<!-- <module>maven-all/compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
+				<module>maven-all/maven</module>
+				<module>maven-all/maven-war-plugin</module>
+				<module>maven-all/profiles</module>
+				<module>maven-all/versions-maven-plugin</module>
 				<!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
 				<module>maven-archetype</module>
 				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->