diff --git a/guava18/README.md b/guava-modules/guava-18/README.md
similarity index 100%
rename from guava18/README.md
rename to guava-modules/guava-18/README.md
diff --git a/guava18/pom.xml b/guava-modules/guava-18/pom.xml
similarity index 90%
rename from guava18/pom.xml
rename to guava-modules/guava-18/pom.xml
index 0b9691817104..a9aba47f1276 100644
--- a/guava18/pom.xml
+++ b/guava-modules/guava-18/pom.xml
@@ -4,13 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava18</artifactId>
+    <artifactId>guava-18</artifactId>
     <version>0.1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/Administrator.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Administrator.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/Administrator.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Administrator.java
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/Player.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Player.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/Player.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/Player.java
diff --git a/guava18/src/main/java/com/baeldung/guava/entity/User.java b/guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/User.java
similarity index 100%
rename from guava18/src/main/java/com/baeldung/guava/entity/User.java
rename to guava-modules/guava-18/src/main/java/com/baeldung/guava/entity/User.java
diff --git a/guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java
diff --git a/guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java b/guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
similarity index 100%
rename from guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
rename to guava-modules/guava-18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java
diff --git a/guava19/README.md b/guava-modules/guava-19/README.md
similarity index 100%
rename from guava19/README.md
rename to guava-modules/guava-19/README.md
diff --git a/guava19/pom.xml b/guava-modules/guava-19/pom.xml
similarity index 91%
rename from guava19/pom.xml
rename to guava-modules/guava-19/pom.xml
index af9bc51eb9c8..2345212ebaf2 100644
--- a/guava19/pom.xml
+++ b/guava-modules/guava-19/pom.xml
@@ -4,13 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung</groupId>
-    <artifactId>guava19</artifactId>
+    <artifactId>guava-19</artifactId>
     <version>0.1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/guava19/src/main/java/com/baeldung/guava/entity/User.java b/guava-modules/guava-19/src/main/java/com/baeldung/guava/entity/User.java
similarity index 100%
rename from guava19/src/main/java/com/baeldung/guava/entity/User.java
rename to guava-modules/guava-19/src/main/java/com/baeldung/guava/entity/User.java
diff --git a/guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/GuavaMiscUtilsTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/HashingUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/HashingUnitTest.java
diff --git a/guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java b/guava-modules/guava-19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
similarity index 100%
rename from guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
rename to guava-modules/guava-19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java
diff --git a/guava21/README.md b/guava-modules/guava-21/README.md
similarity index 100%
rename from guava21/README.md
rename to guava-modules/guava-21/README.md
diff --git a/guava21/pom.xml b/guava-modules/guava-21/pom.xml
similarity index 91%
rename from guava21/pom.xml
rename to guava-modules/guava-21/pom.xml
index 930def2a6721..94bb66e76a63 100644
--- a/guava21/pom.xml
+++ b/guava-modules/guava-21/pom.xml
@@ -4,13 +4,14 @@
          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>
 
-    <artifactId>guava21</artifactId>
+    <artifactId>guava-21</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
      </parent>
 
     <dependencies>
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/AtomicLongMapTutorials.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ComparatorsExamples.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/ConcatStreams.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/InternerBuilderExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MonitorExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/MoreCollectorsExample.java
diff --git a/guava21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java b/guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
similarity index 100%
rename from guava21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
rename to guava-modules/guava-21/src/main/java/com/baeldung/guava/tutorial/StreamsUtility.java
diff --git a/guava21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java b/guava-modules/guava-21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
similarity index 100%
rename from guava21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
rename to guava-modules/guava-21/src/test/java/com.baeldung.guava.zip/ZipCollectionTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/AtomicLongMapIntegrationTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/ComparatorsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/GuavaStreamsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/InternBuilderUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MonitorUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/MoreCollectorsUnitTest.java
diff --git a/guava21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java b/guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
similarity index 100%
rename from guava21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
rename to guava-modules/guava-21/src/test/java/com/baeldung/guava/tutorial/StreamUtility.java
diff --git a/jee7/.gitignore b/jee-7/.gitignore
similarity index 100%
rename from jee7/.gitignore
rename to jee-7/.gitignore
diff --git a/jee7/README.md b/jee-7/README.md
similarity index 100%
rename from jee7/README.md
rename to jee-7/README.md
diff --git a/jee7/pom.xml b/jee-7/pom.xml
similarity index 99%
rename from jee7/pom.xml
rename to jee-7/pom.xml
index 6858a05d17e3..f1d50f55c6c6 100644
--- a/jee7/pom.xml
+++ b/jee-7/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.baeldung</groupId>
-	<artifactId>jee7</artifactId>
+	<artifactId>jee-7</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<description>JavaEE 7 Arquillian Archetype Sample</description>
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CapsConvertor.java b/jee-7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CapsConvertor.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CapsService.java b/jee-7/src/main/java/com/baeldung/arquillian/CapsService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CapsService.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CapsService.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/Car.java b/jee-7/src/main/java/com/baeldung/arquillian/Car.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/Car.java
rename to jee-7/src/main/java/com/baeldung/arquillian/Car.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/CarEJB.java b/jee-7/src/main/java/com/baeldung/arquillian/CarEJB.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/CarEJB.java
rename to jee-7/src/main/java/com/baeldung/arquillian/CarEJB.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/Component.java b/jee-7/src/main/java/com/baeldung/arquillian/Component.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/Component.java
rename to jee-7/src/main/java/com/baeldung/arquillian/Component.java
diff --git a/jee7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java b/jee-7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
rename to jee-7/src/main/java/com/baeldung/arquillian/ConvertToLowerCase.java
diff --git a/jee7/src/main/java/com/baeldung/convListVal/ConvListVal.java b/jee-7/src/main/java/com/baeldung/convListVal/ConvListVal.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/convListVal/ConvListVal.java
rename to jee-7/src/main/java/com/baeldung/convListVal/ConvListVal.java
diff --git a/jee7/src/main/java/com/baeldung/convListVal/MyListener.java b/jee-7/src/main/java/com/baeldung/convListVal/MyListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/convListVal/MyListener.java
rename to jee-7/src/main/java/com/baeldung/convListVal/MyListener.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/README.txt
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/pom.xml
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/LogInFilter.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/WEB-INF/web.xml
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/index.jsp
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/login.jsp
diff --git a/jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp b/jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
similarity index 100%
rename from jee7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
rename to jee-7/src/main/java/com/baeldung/javaeeannotations/JavaEEAnnotationsSample/src/main/webapp/upload.jsp
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/AddEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java b/jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployees.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/CountEmployeesResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/DeleteEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/Employee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/Employee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/Employee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/Employee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeAlreadyExists_Exception.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeNotFound_Exception.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeServiceClient.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java b/jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/EmployeeService_Service.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployees.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetAllEmployeesResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/GetEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java b/jee-7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/ObjectFactory.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java b/jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java b/jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/UpdateEmployeeResponse.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/client/package-info.java b/jee-7/src/main/java/com/baeldung/jaxws/client/package-info.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/client/package-info.java
rename to jee-7/src/main/java/com/baeldung/jaxws/client/package-info.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeService.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/EmployeeServiceImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeAlreadyExists.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/exception/EmployeeNotFound.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java b/jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/bottomup/model/Employee.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java b/jee-7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/config/EmployeeServicePublisher.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java b/jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepository.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/repository/EmployeeRepositoryImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDownImpl.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/EmployeeServiceTopDown_Service.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java b/jee-7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
rename to jee-7/src/main/java/com/baeldung/jaxws/server/topdown/ObjectFactory.java
diff --git a/jee7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl b/jee-7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
similarity index 100%
rename from jee7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
rename to jee-7/src/main/java/com/baeldung/jaxws/wsdl/employeeservicetopdown.wsdl
diff --git a/jee7/src/main/java/com/baeldung/json/Person.java b/jee-7/src/main/java/com/baeldung/json/Person.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/Person.java
rename to jee-7/src/main/java/com/baeldung/json/Person.java
diff --git a/jee7/src/main/java/com/baeldung/json/PersonBuilder.java b/jee-7/src/main/java/com/baeldung/json/PersonBuilder.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/PersonBuilder.java
rename to jee-7/src/main/java/com/baeldung/json/PersonBuilder.java
diff --git a/jee7/src/main/java/com/baeldung/json/PersonWriter.java b/jee-7/src/main/java/com/baeldung/json/PersonWriter.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/json/PersonWriter.java
rename to jee-7/src/main/java/com/baeldung/json/PersonWriter.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java b/jee-7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/ApplicationConfig.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java b/jee-7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/SecurityWebApplicationInitializer.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java b/jee-7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/SpringSecurityConfig.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java b/jee-7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/controller/HomeController.java
diff --git a/jee7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java b/jee-7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
rename to jee-7/src/main/java/com/baeldung/springSecurity/controller/LoginController.java
diff --git a/jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/AutomaticTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/FixedDelayTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ProgrammaticWithInitialFixedDelayTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java b/jee-7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/ScheduleTimerBean.java
diff --git a/jee7/src/main/java/com/baeldung/timer/TimerEvent.java b/jee-7/src/main/java/com/baeldung/timer/TimerEvent.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/TimerEvent.java
rename to jee-7/src/main/java/com/baeldung/timer/TimerEvent.java
diff --git a/jee7/src/main/java/com/baeldung/timer/TimerEventListener.java b/jee-7/src/main/java/com/baeldung/timer/TimerEventListener.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/TimerEventListener.java
rename to jee-7/src/main/java/com/baeldung/timer/TimerEventListener.java
diff --git a/jee7/src/main/java/com/baeldung/timer/WorkerBean.java b/jee-7/src/main/java/com/baeldung/timer/WorkerBean.java
similarity index 100%
rename from jee7/src/main/java/com/baeldung/timer/WorkerBean.java
rename to jee-7/src/main/java/com/baeldung/timer/WorkerBean.java
diff --git a/jee7/src/main/resources/META-INF/persistence.xml b/jee-7/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from jee7/src/main/resources/META-INF/persistence.xml
rename to jee-7/src/main/resources/META-INF/persistence.xml
diff --git a/jee7/src/main/webapp/ConvListVal.xhtml b/jee-7/src/main/webapp/ConvListVal.xhtml
similarity index 100%
rename from jee7/src/main/webapp/ConvListVal.xhtml
rename to jee-7/src/main/webapp/ConvListVal.xhtml
diff --git a/jee7/src/main/webapp/WEB-INF/beans.xml b/jee-7/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/beans.xml
rename to jee-7/src/main/webapp/WEB-INF/beans.xml
diff --git a/jee7/src/main/webapp/WEB-INF/faces-config.xml b/jee-7/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/faces-config.xml
rename to jee-7/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/jee7/src/main/webapp/WEB-INF/spring/security.xml b/jee-7/src/main/webapp/WEB-INF/spring/security.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/spring/security.xml
rename to jee-7/src/main/webapp/WEB-INF/spring/security.xml
diff --git a/jee7/src/main/webapp/WEB-INF/views/admin.jsp b/jee-7/src/main/webapp/WEB-INF/views/admin.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/admin.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/admin.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/home.jsp b/jee-7/src/main/webapp/WEB-INF/views/home.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/home.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/home.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/login.jsp b/jee-7/src/main/webapp/WEB-INF/views/login.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/login.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/login.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/views/user.jsp b/jee-7/src/main/webapp/WEB-INF/views/user.jsp
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/views/user.jsp
rename to jee-7/src/main/webapp/WEB-INF/views/user.jsp
diff --git a/jee7/src/main/webapp/WEB-INF/web.xml b/jee-7/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from jee7/src/main/webapp/WEB-INF/web.xml
rename to jee-7/src/main/webapp/WEB-INF/web.xml
diff --git a/jee7/src/main/webapp/index.jsp b/jee-7/src/main/webapp/index.jsp
similarity index 100%
rename from jee7/src/main/webapp/index.jsp
rename to jee-7/src/main/webapp/index.jsp
diff --git a/jee7/src/main/webapp/secure.jsp b/jee-7/src/main/webapp/secure.jsp
similarity index 100%
rename from jee7/src/main/webapp/secure.jsp
rename to jee-7/src/main/webapp/secure.jsp
diff --git a/jee7/src/test/java/com/baeldug/json/JsonUnitTest.java b/jee-7/src/test/java/com/baeldug/json/JsonUnitTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldug/json/JsonUnitTest.java
rename to jee-7/src/test/java/com/baeldug/json/JsonUnitTest.java
diff --git a/jee7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java b/jee-7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
rename to jee-7/src/test/java/com/baeldung/arquillan/ArquillianLiveTest.java
diff --git a/jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java b/jee-7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java b/jee-7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
rename to jee-7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/AutomaticTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticAtFixedRateTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ProgrammaticWithFixedDelayTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java b/jee-7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
rename to jee-7/src/test/java/com/baeldung/timer/ScheduleTimerBeanIntegrationTest.java
diff --git a/jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java b/jee-7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
similarity index 100%
rename from jee7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
rename to jee-7/src/test/java/com/baeldung/timer/WithinWindowMatcher.java
diff --git a/jee7/src/test/resources/META-INF/persistence.xml b/jee-7/src/test/resources/META-INF/persistence.xml
similarity index 100%
rename from jee7/src/test/resources/META-INF/persistence.xml
rename to jee-7/src/test/resources/META-INF/persistence.xml
diff --git a/libraries-data/file.dat b/libraries-data/file.dat
new file mode 100644
index 000000000000..70177cef976a
Binary files /dev/null and b/libraries-data/file.dat differ
diff --git a/log-mdc/README.md b/logging-modules/log-mdc/README.md
similarity index 100%
rename from log-mdc/README.md
rename to logging-modules/log-mdc/README.md
diff --git a/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
similarity index 98%
rename from log-mdc/pom.xml
rename to logging-modules/log-mdc/pom.xml
index e91d4e231e5c..918e052a1505 100644
--- a/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -12,6 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
diff --git a/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransactionFactory.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/Transfer.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferDemo.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JRunnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j/Log4JTransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2Runnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/log4j2/Log4J2TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4TransferService.java
diff --git a/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java b/logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/mdc/slf4j/Slf4jRunnable.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/Investment.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/Investment.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/Investment.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/Investment.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/JBossLoggingController.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4J2Controller.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/controller/Log4JController.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/InvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/JBossLoggingInvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4J2InvestmentService.java
diff --git a/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java b/logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
similarity index 100%
rename from log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
rename to logging-modules/log-mdc/src/main/java/com/baeldung/ndc/service/Log4JInvestmentService.java
diff --git a/log-mdc/src/main/resources/log4j.properties b/logging-modules/log-mdc/src/main/resources/log4j.properties
similarity index 100%
rename from log-mdc/src/main/resources/log4j.properties
rename to logging-modules/log-mdc/src/main/resources/log4j.properties
diff --git a/log-mdc/src/main/resources/log4j2.xml b/logging-modules/log-mdc/src/main/resources/log4j2.xml
similarity index 100%
rename from log-mdc/src/main/resources/log4j2.xml
rename to logging-modules/log-mdc/src/main/resources/log4j2.xml
diff --git a/log-mdc/src/main/resources/logback.xml b/logging-modules/log-mdc/src/main/resources/logback.xml
similarity index 100%
rename from log-mdc/src/main/resources/logback.xml
rename to logging-modules/log-mdc/src/main/resources/logback.xml
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java
diff --git a/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java b/logging-modules/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
similarity index 100%
rename from log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
rename to logging-modules/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java
diff --git a/log4j/README.md b/logging-modules/log4j/README.md
similarity index 100%
rename from log4j/README.md
rename to logging-modules/log4j/README.md
diff --git a/log4j/pom.xml b/logging-modules/log4j/pom.xml
similarity index 97%
rename from log4j/pom.xml
rename to logging-modules/log4j/pom.xml
index 20906c4c05d3..a3bfb0a33a17 100644
--- a/log4j/pom.xml
+++ b/logging-modules/log4j/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <dependencies>
diff --git a/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
diff --git a/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j/Log4jRollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/log4j2/Log4j2RollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackExample.java b/logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/logback/LogbackExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/logback/LogbackRollingExample.java
diff --git a/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java b/logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jExample.java
diff --git a/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java b/logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
similarity index 100%
rename from log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
rename to logging-modules/log4j/src/main/java/com/baeldung/slf4j/Slf4jRollingExample.java
diff --git a/log4j/src/main/resources/log4j.xml b/logging-modules/log4j/src/main/resources/log4j.xml
similarity index 100%
rename from log4j/src/main/resources/log4j.xml
rename to logging-modules/log4j/src/main/resources/log4j.xml
diff --git a/log4j/src/main/resources/log4j2.xml b/logging-modules/log4j/src/main/resources/log4j2.xml
similarity index 100%
rename from log4j/src/main/resources/log4j2.xml
rename to logging-modules/log4j/src/main/resources/log4j2.xml
diff --git a/log4j/src/main/resources/logback.xml b/logging-modules/log4j/src/main/resources/logback.xml
similarity index 100%
rename from log4j/src/main/resources/logback.xml
rename to logging-modules/log4j/src/main/resources/logback.xml
diff --git a/log4j2/README.md b/logging-modules/log4j2/README.md
similarity index 100%
rename from log4j2/README.md
rename to logging-modules/log4j2/README.md
diff --git a/log4j2/pom.xml b/logging-modules/log4j2/pom.xml
similarity index 98%
rename from log4j2/pom.xml
rename to logging-modules/log4j2/pom.xml
index ea398af8451f..58bc4b74e7e5 100644
--- a/log4j2/pom.xml
+++ b/logging-modules/log4j2/pom.xml
@@ -9,7 +9,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/LambdaExpressionsIntegrationTest.java
diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
similarity index 100%
rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
rename to logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/jdbc/ConnectionFactory.java
diff --git a/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml b/logging-modules/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
similarity index 100%
rename from log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
rename to logging-modules/log4j2/src/test/resources/log4j2-includes/console-appender_pattern-layout_colored.xml
diff --git a/log4j2/src/test/resources/log4j2.xml b/logging-modules/log4j2/src/test/resources/log4j2.xml
similarity index 100%
rename from log4j2/src/test/resources/log4j2.xml
rename to logging-modules/log4j2/src/test/resources/log4j2.xml
diff --git a/pom.xml b/pom.xml
index 5af1dab012b1..b9186f93042d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,9 +68,9 @@
         <module>testing-modules/groovy-spock</module>
         <module>gson</module>
         <module>guava</module>
-        <module>guava18</module>
-        <module>guava19</module>
-        <module>guava21</module>
+        <module>guava-modules/guava-18</module>
+        <module>guava-modules/guava-19</module>
+        <module>guava-modules/guava-21</module>
         <module>guice</module>
         <module>disruptor</module>
 
@@ -90,7 +90,7 @@
         <module>javax-servlets</module>
         <module>javaxval</module>
         <module>jaxb</module>
-        <module>jee7</module>
+        <module>jee-7</module>
         <!-- <module>jhipster/jhipster-monolithic</module> -->
         <module>jjwt</module>
         <module>jpa-storedprocedure</module>
@@ -104,9 +104,9 @@
         <module>libraries</module>
         <module>libraries-data</module>
         <module>linkrest</module>        
-        <module>log-mdc</module>
-        <module>log4j</module>
-        <module>log4j2</module>
+        <module>logging-modules/log-mdc</module>
+        <module>logging-modules/log4j</module>
+        <module>logging-modules/log4j2</module>
         <module>lombok</module>
        <!-- <module>kotlin</module>-->
         <module>mapstruct</module>
@@ -242,8 +242,8 @@
         <module>video-tutorials</module>
 
         <module>xml</module>
-        <module>xmlunit2</module>
-        <module>struts2</module>
+        <module>xmlunit-2</module>
+        <module>struts-2</module>
         <module>apache-velocity</module>
         <module>apache-solrj</module>
 
diff --git a/struts2/README.md b/struts-2/README.md
similarity index 100%
rename from struts2/README.md
rename to struts-2/README.md
diff --git a/struts2/WebContent/WEB-INF/web.xml b/struts-2/WebContent/WEB-INF/web.xml
similarity index 100%
rename from struts2/WebContent/WEB-INF/web.xml
rename to struts-2/WebContent/WEB-INF/web.xml
diff --git a/struts2/WebContent/input.jsp b/struts-2/WebContent/input.jsp
similarity index 100%
rename from struts2/WebContent/input.jsp
rename to struts-2/WebContent/input.jsp
diff --git a/struts2/WebContent/result.jsp b/struts-2/WebContent/result.jsp
similarity index 100%
rename from struts2/WebContent/result.jsp
rename to struts-2/WebContent/result.jsp
diff --git a/struts2/pom.xml b/struts-2/pom.xml
similarity index 100%
rename from struts2/pom.xml
rename to struts-2/pom.xml
diff --git a/struts2/src/main/java/com/baeldung/struts/CarAction.java b/struts-2/src/main/java/com/baeldung/struts/CarAction.java
similarity index 100%
rename from struts2/src/main/java/com/baeldung/struts/CarAction.java
rename to struts-2/src/main/java/com/baeldung/struts/CarAction.java
diff --git a/struts2/src/main/java/com/baeldung/struts/CarMessageService.java b/struts-2/src/main/java/com/baeldung/struts/CarMessageService.java
similarity index 100%
rename from struts2/src/main/java/com/baeldung/struts/CarMessageService.java
rename to struts-2/src/main/java/com/baeldung/struts/CarMessageService.java
diff --git a/struts2/src/test/java/com/baeldung/struts/test/CarActionTest.java b/struts-2/src/test/java/com/baeldung/struts/test/CarActionTest.java
similarity index 100%
rename from struts2/src/test/java/com/baeldung/struts/test/CarActionTest.java
rename to struts-2/src/test/java/com/baeldung/struts/test/CarActionTest.java
diff --git a/xmlunit2/README.md b/xmlunit-2/README.md
similarity index 100%
rename from xmlunit2/README.md
rename to xmlunit-2/README.md
diff --git a/xmlunit2/pom.xml b/xmlunit-2/pom.xml
similarity index 96%
rename from xmlunit2/pom.xml
rename to xmlunit-2/pom.xml
index dd9fe9ac2764..591cb70ec889 100644
--- a/xmlunit2/pom.xml
+++ b/xmlunit-2/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>xmlunit2</artifactId>
+    <artifactId>xmlunit-2</artifactId>
     <version>1.0</version>
     <name>XMLUnit-2</name>
 
diff --git a/xmlunit2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java b/xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
similarity index 100%
rename from xmlunit2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
rename to xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
diff --git a/xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java b/xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
similarity index 100%
rename from xmlunit2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
rename to xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
diff --git a/xmlunit2/src/test/resources/control.xml b/xmlunit-2/src/test/resources/control.xml
similarity index 100%
rename from xmlunit2/src/test/resources/control.xml
rename to xmlunit-2/src/test/resources/control.xml
diff --git a/xmlunit2/src/test/resources/students.xml b/xmlunit-2/src/test/resources/students.xml
similarity index 100%
rename from xmlunit2/src/test/resources/students.xml
rename to xmlunit-2/src/test/resources/students.xml
diff --git a/xmlunit2/src/test/resources/students.xsd b/xmlunit-2/src/test/resources/students.xsd
similarity index 100%
rename from xmlunit2/src/test/resources/students.xsd
rename to xmlunit-2/src/test/resources/students.xsd
diff --git a/xmlunit2/src/test/resources/students_with_error.xml b/xmlunit-2/src/test/resources/students_with_error.xml
similarity index 100%
rename from xmlunit2/src/test/resources/students_with_error.xml
rename to xmlunit-2/src/test/resources/students_with_error.xml
diff --git a/xmlunit2/src/test/resources/teachers.xml b/xmlunit-2/src/test/resources/teachers.xml
similarity index 100%
rename from xmlunit2/src/test/resources/teachers.xml
rename to xmlunit-2/src/test/resources/teachers.xml
diff --git a/xmlunit2/src/test/resources/test.xml b/xmlunit-2/src/test/resources/test.xml
similarity index 100%
rename from xmlunit2/src/test/resources/test.xml
rename to xmlunit-2/src/test/resources/test.xml