diff --git a/pom.xml b/pom.xml
index bc8e35ba94..631a2c9b26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,10 +62,10 @@
         <module>feign</module>
         <module>flyway</module>
 
-        <!-- <module>gatling</module> --> <!-- not meant to run as part of the standard build -->
+        <!-- <module>testing-modules/gatling</module> --> <!-- not meant to run as part of the standard build -->
 
         <module>geotools</module>
-        <module>groovy-spock</module>
+        <module>testing-modules/groovy-spock</module>
         <module>gson</module>
         <module>guava</module>
         <module>guava18</module>
@@ -98,7 +98,7 @@
         <module>json-path</module>
         <module>json</module>
         <module>jsoup</module>
-        <module>junit5</module>
+        <module>testing-modules/junit-5</module>
         <module>jws</module>
 
         <module>libraries</module>
@@ -112,9 +112,9 @@
         <module>mapstruct</module>
         <module>metrics</module>
         <module>mesos-marathon</module>
-        <module>mockito</module>
-        <module>mockito2</module>
-        <module>mocks</module>
+        <module>testing-modules/mockito</module>
+        <module>testing-modules/mockito-2</module>
+        <module>testing-modules/mocks</module>
         <module>mustache</module>
         <module>noexception</module>
 
@@ -129,13 +129,13 @@
         <!-- <module>raml</module> -->
         <module>reactor-core</module>
         <module>persistence-modules/redis</module>
-        <module>rest-assured</module>
-        <module>rest-testing</module>
+        <module>testing-modules/rest-assured</module>
+        <module>testing-modules/rest-testing</module>
         <module>resteasy</module>
         <module>rxjava</module>
         <module>spring-swagger-codegen</module>
 
-        <module>selenium-junit-testng</module>
+        <module>testing-modules/selenium-junit-testng</module>
         <module>persistence-modules/solr</module>
         <module>spark-java</module>
       <!--  <module>spring-5</module>-->
@@ -235,8 +235,8 @@
 		<module>spring-rest-embedded-tomcat</module>
         
 
-        <module>testing</module>
-        <module>testng</module>
+        <module>testing-modules/testing</module>
+        <module>testing-modules/testng</module>
 
         <module>video-tutorials</module>
 
@@ -254,7 +254,7 @@
         <module>drools</module>
         <module>persistence-modules/liquibase</module>
         <module>spring-boot-property-exp</module>
-        <module>mockserver</module>
+        <module>testing-modules/mockserver</module>
         <module>undertow</module>
         <module>vertx-and-rxjava</module>
         <module>saas</module>
diff --git a/gatling/README.md b/testing-modules/gatling/README.md
similarity index 100%
rename from gatling/README.md
rename to testing-modules/gatling/README.md
diff --git a/gatling/pom.xml b/testing-modules/gatling/pom.xml
similarity index 100%
rename from gatling/pom.xml
rename to testing-modules/gatling/pom.xml
diff --git a/gatling/src/test/resources/gatling.conf b/testing-modules/gatling/src/test/resources/gatling.conf
similarity index 100%
rename from gatling/src/test/resources/gatling.conf
rename to testing-modules/gatling/src/test/resources/gatling.conf
diff --git a/gatling/src/test/resources/logback.xml b/testing-modules/gatling/src/test/resources/logback.xml
similarity index 100%
rename from gatling/src/test/resources/logback.xml
rename to testing-modules/gatling/src/test/resources/logback.xml
diff --git a/gatling/src/test/resources/recorder.conf b/testing-modules/gatling/src/test/resources/recorder.conf
similarity index 100%
rename from gatling/src/test/resources/recorder.conf
rename to testing-modules/gatling/src/test/resources/recorder.conf
diff --git a/gatling/src/test/scala/Engine.scala b/testing-modules/gatling/src/test/scala/Engine.scala
similarity index 100%
rename from gatling/src/test/scala/Engine.scala
rename to testing-modules/gatling/src/test/scala/Engine.scala
diff --git a/gatling/src/test/scala/IDEPathHelper.scala b/testing-modules/gatling/src/test/scala/IDEPathHelper.scala
similarity index 100%
rename from gatling/src/test/scala/IDEPathHelper.scala
rename to testing-modules/gatling/src/test/scala/IDEPathHelper.scala
diff --git a/gatling/src/test/scala/Recorder.scala b/testing-modules/gatling/src/test/scala/Recorder.scala
similarity index 100%
rename from gatling/src/test/scala/Recorder.scala
rename to testing-modules/gatling/src/test/scala/Recorder.scala
diff --git a/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala b/testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
similarity index 100%
rename from gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
rename to testing-modules/gatling/src/test/scala/org/baeldung/RecordedSimulation.scala
diff --git a/groovy-spock/README.md b/testing-modules/groovy-spock/README.md
similarity index 100%
rename from groovy-spock/README.md
rename to testing-modules/groovy-spock/README.md
diff --git a/groovy-spock/pom.xml b/testing-modules/groovy-spock/pom.xml
similarity index 97%
rename from groovy-spock/pom.xml
rename to testing-modules/groovy-spock/pom.xml
index d9b51c5e1a..f4e61e6786 100644
--- a/groovy-spock/pom.xml
+++ b/testing-modules/groovy-spock/pom.xml
@@ -17,6 +17,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <build>
diff --git a/groovy-spock/src/test/groovy/FirstSpecification.groovy b/testing-modules/groovy-spock/src/test/groovy/FirstSpecification.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/FirstSpecification.groovy
rename to testing-modules/groovy-spock/src/test/groovy/FirstSpecification.groovy
diff --git a/groovy-spock/src/test/groovy/Notifier.groovy b/testing-modules/groovy-spock/src/test/groovy/Notifier.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/Notifier.groovy
rename to testing-modules/groovy-spock/src/test/groovy/Notifier.groovy
diff --git a/groovy-spock/src/test/groovy/PaymentGateway.groovy b/testing-modules/groovy-spock/src/test/groovy/PaymentGateway.groovy
similarity index 100%
rename from groovy-spock/src/test/groovy/PaymentGateway.groovy
rename to testing-modules/groovy-spock/src/test/groovy/PaymentGateway.groovy
diff --git a/junit5/README.md b/testing-modules/junit-5/README.md
similarity index 100%
rename from junit5/README.md
rename to testing-modules/junit-5/README.md
diff --git a/junit5/pom.xml b/testing-modules/junit-5/pom.xml
similarity index 97%
rename from junit5/pom.xml
rename to testing-modules/junit-5/pom.xml
index b8a7622b3d..229703ccf5 100644
--- a/junit5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -4,16 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- NOT NEEDED - JSP <groupId>com.baeldung</groupId>-->
-    <artifactId>junit5</artifactId>
+    <artifactId>junit-5</artifactId>
     <version>1.0-SNAPSHOT</version>
 
-    <name>junit5</name>
+    <name>junit-5</name>
     <description>Intro to JUnit 5</description>
 	
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <properties>
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/User.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/User.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/User.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/User.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java
diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java b/testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
similarity index 100%
rename from junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java
diff --git a/junit5/src/test/java/com/baeldung/AssertionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/AssertionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/AssumptionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/AssumptionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/DynamicTestsExample.java b/testing-modules/junit-5/src/test/java/com/baeldung/DynamicTestsExample.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/DynamicTestsExample.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/DynamicTestsExample.java
diff --git a/junit5/src/test/java/com/baeldung/EmployeesTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/EmployeesTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/EmployeesTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/EmployeesTest.java
diff --git a/junit5/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/ExceptionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/FirstUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/LiveTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java
diff --git a/junit5/src/test/java/com/baeldung/NestedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/NestedUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/RepeatedTestExample.java b/testing-modules/junit-5/src/test/java/com/baeldung/RepeatedTestExample.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/RepeatedTestExample.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/RepeatedTestExample.java
diff --git a/junit5/src/test/java/com/baeldung/StringUtils.java b/testing-modules/junit-5/src/test/java/com/baeldung/StringUtils.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/StringUtils.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/StringUtils.java
diff --git a/junit5/src/test/java/com/baeldung/TaggedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/TaggedUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/TaggedUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/TaggedUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/TestLauncher.java b/testing-modules/junit-5/src/test/java/com/baeldung/TestLauncher.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/TestLauncher.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/TestLauncher.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDaoParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EmployeeDatabaseSetupExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/EnvironmentExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/IgnoreFileNotFoundExceptionExtension.java
diff --git a/junit5/src/test/java/com/baeldung/extensions/LoggingExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/extensions/LoggingExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/extensions/LoggingExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/extensions/LoggingExtension.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/Employee.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/Employee.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/Employee.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/Employee.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/EmployeeDao.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeDao.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/EmployeeDao.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeDao.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/EmployeeJdbcDao.java
diff --git a/junit5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java b/testing-modules/junit-5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/helpers/JdbcConnectionUtil.java
diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java
diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4Tests.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleTest.java
diff --git a/junit5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
diff --git a/junit5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/InvalidPersonParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/param/Person.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/Person.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/Person.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/Person.java
diff --git a/junit5/src/test/java/com/baeldung/param/PersonValidator.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidator.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/PersonValidator.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidator.java
diff --git a/junit5/src/test/java/com/baeldung/param/PersonValidatorTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidatorTest.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/PersonValidatorTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/PersonValidatorTest.java
diff --git a/junit5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java b/testing-modules/junit-5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/param/ValidPersonParameterResolver.java
diff --git a/junit5/src/test/java/com/baeldung/suites/AllTests.java b/testing-modules/junit-5/src/test/java/com/baeldung/suites/AllTests.java
similarity index 100%
rename from junit5/src/test/java/com/baeldung/suites/AllTests.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/suites/AllTests.java
diff --git a/junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/testing-modules/junit-5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from junit5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to testing-modules/junit-5/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/junit5/src/test/resources/com/baeldung/extensions/application.properties b/testing-modules/junit-5/src/test/resources/com/baeldung/extensions/application.properties
similarity index 100%
rename from junit5/src/test/resources/com/baeldung/extensions/application.properties
rename to testing-modules/junit-5/src/test/resources/com/baeldung/extensions/application.properties
diff --git a/junit5/src/test/resources/com/baeldung/helpers/jdbc.properties b/testing-modules/junit-5/src/test/resources/com/baeldung/helpers/jdbc.properties
similarity index 100%
rename from junit5/src/test/resources/com/baeldung/helpers/jdbc.properties
rename to testing-modules/junit-5/src/test/resources/com/baeldung/helpers/jdbc.properties
diff --git a/mockito2/.gitignore b/testing-modules/mockito-2/.gitignore
similarity index 100%
rename from mockito2/.gitignore
rename to testing-modules/mockito-2/.gitignore
diff --git a/mockito2/README.md b/testing-modules/mockito-2/README.md
similarity index 100%
rename from mockito2/README.md
rename to testing-modules/mockito-2/README.md
diff --git a/mockito2/pom.xml b/testing-modules/mockito-2/pom.xml
similarity index 96%
rename from mockito2/pom.xml
rename to testing-modules/mockito-2/pom.xml
index a7c4683c30..0291ac4ec1 100644
--- a/mockito2/pom.xml
+++ b/testing-modules/mockito-2/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>mockito2</artifactId>
+    <artifactId>mockito-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>mockito-2-with-java8</name>
@@ -12,6 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <profiles>
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/JobPosition.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobPosition.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/JobService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobService.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/JobService.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/JobService.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/Person.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/Person.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/Person.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/Person.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentService.java
diff --git a/mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
similarity index 100%
rename from mockito2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
rename to testing-modules/mockito-2/src/main/java/com/baeldung/mockito/java8/UnemploymentServiceImpl.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/ArgumentMatcherWithoutLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/CustomAnswerWithoutLambdaUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/JobServiceUnitTest.java
diff --git a/mockito2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
similarity index 100%
rename from mockito2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
rename to testing-modules/mockito-2/src/test/java/com/baeldung/mockito/java8/UnemploymentServiceImplUnitTest.java
diff --git a/mockito/.gitignore b/testing-modules/mockito/.gitignore
similarity index 100%
rename from mockito/.gitignore
rename to testing-modules/mockito/.gitignore
diff --git a/mockito/README.md b/testing-modules/mockito/README.md
similarity index 100%
rename from mockito/README.md
rename to testing-modules/mockito/README.md
diff --git a/mockito/pom.xml b/testing-modules/mockito/pom.xml
similarity index 98%
rename from mockito/pom.xml
rename to testing-modules/mockito/pom.xml
index 19dd2f6468..aa3dd9b20a 100644
--- a/mockito/pom.xml
+++ b/testing-modules/mockito/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/mockito/src/main/resources/logback.xml b/testing-modules/mockito/src/main/resources/logback.xml
similarity index 100%
rename from mockito/src/main/resources/logback.xml
rename to testing-modules/mockito/src/main/resources/logback.xml
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java
diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java b/testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
rename to testing-modules/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoExceptionIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MyDictionary.java
diff --git a/mockito/src/test/java/org/baeldung/mockito/MyList.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
similarity index 100%
rename from mockito/src/test/java/org/baeldung/mockito/MyList.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MyList.java
diff --git a/mocks/README.md b/testing-modules/mocks/README.md
similarity index 100%
rename from mocks/README.md
rename to testing-modules/mocks/README.md
diff --git a/mocks/jmockit/README.md b/testing-modules/mocks/jmockit/README.md
similarity index 100%
rename from mocks/jmockit/README.md
rename to testing-modules/mocks/jmockit/README.md
diff --git a/mocks/jmockit/pom.xml b/testing-modules/mocks/jmockit/pom.xml
similarity index 95%
rename from mocks/jmockit/pom.xml
rename to testing-modules/mocks/jmockit/pom.xml
index 173a981e09..d998cb6918 100644
--- a/mocks/jmockit/pom.xml
+++ b/testing-modules/mocks/jmockit/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>mocks</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>jmockit</artifactId>
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Model.java
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java b/testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
similarity index 100%
rename from mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
rename to testing-modules/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/Performer.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java b/testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
similarity index 100%
rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
rename to testing-modules/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
diff --git a/mocks/mock-comparisons/README.md b/testing-modules/mocks/mock-comparisons/README.md
similarity index 100%
rename from mocks/mock-comparisons/README.md
rename to testing-modules/mocks/mock-comparisons/README.md
diff --git a/mocks/mock-comparisons/pom.xml b/testing-modules/mocks/mock-comparisons/pom.xml
similarity index 97%
rename from mocks/mock-comparisons/pom.xml
rename to testing-modules/mocks/mock-comparisons/pom.xml
index 11bc59d710..84f1d20401 100644
--- a/mocks/mock-comparisons/pom.xml
+++ b/testing-modules/mocks/mock-comparisons/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>mocks</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mock-comparisons</artifactId>
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginController.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/LoginService.java
diff --git a/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java b/testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
similarity index 100%
rename from mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
rename to testing-modules/mocks/mock-comparisons/src/main/java/org/baeldung/mocks/testCase/UserForm.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java b/testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
similarity index 100%
rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
diff --git a/mocks/pom.xml b/testing-modules/mocks/pom.xml
similarity index 92%
rename from mocks/pom.xml
rename to testing-modules/mocks/pom.xml
index 84243a25d2..959c1851d6 100644
--- a/mocks/pom.xml
+++ b/testing-modules/mocks/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>mocks</artifactId>
diff --git a/mockserver/README.md b/testing-modules/mockserver/README.md
similarity index 100%
rename from mockserver/README.md
rename to testing-modules/mockserver/README.md
diff --git a/mockserver/pom.xml b/testing-modules/mockserver/pom.xml
similarity index 100%
rename from mockserver/pom.xml
rename to testing-modules/mockserver/pom.xml
diff --git a/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java b/testing-modules/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
similarity index 100%
rename from mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
rename to testing-modules/mockserver/src/main/java/com/baeldung/mock/server/ExpectationCallbackHandler.java
diff --git a/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java b/testing-modules/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
similarity index 100%
rename from mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
rename to testing-modules/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
diff --git a/rest-assured/.gitignore b/testing-modules/rest-assured/.gitignore
similarity index 100%
rename from rest-assured/.gitignore
rename to testing-modules/rest-assured/.gitignore
diff --git a/rest-assured/README.md b/testing-modules/rest-assured/README.md
similarity index 100%
rename from rest-assured/README.md
rename to testing-modules/rest-assured/README.md
diff --git a/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
similarity index 99%
rename from rest-assured/pom.xml
rename to testing-modules/rest-assured/pom.xml
index 3fca54c80f..0c0826c5c3 100644
--- a/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java
diff --git a/rest-assured/src/test/java/com/baeldung/restassured/Util.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/Util.java
similarity index 100%
rename from rest-assured/src/test/java/com/baeldung/restassured/Util.java
rename to testing-modules/rest-assured/src/test/java/com/baeldung/restassured/Util.java
diff --git a/rest-assured/src/test/resources/employees.xml b/testing-modules/rest-assured/src/test/resources/employees.xml
similarity index 100%
rename from rest-assured/src/test/resources/employees.xml
rename to testing-modules/rest-assured/src/test/resources/employees.xml
diff --git a/rest-assured/src/test/resources/event_0.json b/testing-modules/rest-assured/src/test/resources/event_0.json
similarity index 100%
rename from rest-assured/src/test/resources/event_0.json
rename to testing-modules/rest-assured/src/test/resources/event_0.json
diff --git a/rest-assured/src/test/resources/logback.xml b/testing-modules/rest-assured/src/test/resources/logback.xml
similarity index 100%
rename from rest-assured/src/test/resources/logback.xml
rename to testing-modules/rest-assured/src/test/resources/logback.xml
diff --git a/rest-assured/src/test/resources/odds.json b/testing-modules/rest-assured/src/test/resources/odds.json
similarity index 100%
rename from rest-assured/src/test/resources/odds.json
rename to testing-modules/rest-assured/src/test/resources/odds.json
diff --git a/rest-assured/src/test/resources/teachers.xml b/testing-modules/rest-assured/src/test/resources/teachers.xml
similarity index 100%
rename from rest-assured/src/test/resources/teachers.xml
rename to testing-modules/rest-assured/src/test/resources/teachers.xml
diff --git a/rest-testing/.gitignore b/testing-modules/rest-testing/.gitignore
similarity index 100%
rename from rest-testing/.gitignore
rename to testing-modules/rest-testing/.gitignore
diff --git a/rest-testing/README.md b/testing-modules/rest-testing/README.md
similarity index 100%
rename from rest-testing/README.md
rename to testing-modules/rest-testing/README.md
diff --git a/rest-testing/pom.xml b/testing-modules/rest-testing/pom.xml
similarity index 99%
rename from rest-testing/pom.xml
rename to testing-modules/rest-testing/pom.xml
index 74ea5760c4..4b838720da 100644
--- a/rest-testing/pom.xml
+++ b/testing-modules/rest-testing/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/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
new file mode 100644
index 0000000000..99dd8249fe
--- /dev/null
+++ b/testing-modules/rest-testing/src/main/resources/Feature/cucumber.feature
@@ -0,0 +1,10 @@
+Feature: Testing a REST API
+  Users should be able to submit GET and POST requests to a web service, represented by WireMock
+
+  Scenario: Data Upload to a web service
+    When users upload data on a project
+    Then the server should handle it and return a success status
+
+  Scenario: Data retrieval from a web service
+    When users want to get information on the Cucumber project
+    Then the requested data is returned
\ No newline at end of file
diff --git a/rest-testing/src/main/resources/cucumber.json b/testing-modules/rest-testing/src/main/resources/cucumber.json
similarity index 100%
rename from rest-testing/src/main/resources/cucumber.json
rename to testing-modules/rest-testing/src/main/resources/cucumber.json
diff --git a/rest-testing/src/main/resources/logback.xml b/testing-modules/rest-testing/src/main/resources/logback.xml
similarity index 100%
rename from rest-testing/src/main/resources/logback.xml
rename to testing-modules/rest-testing/src/main/resources/logback.xml
diff --git a/rest-testing/src/main/resources/wiremock_intro.json b/testing-modules/rest-testing/src/main/resources/wiremock_intro.json
similarity index 100%
rename from rest-testing/src/main/resources/wiremock_intro.json
rename to testing-modules/rest-testing/src/main/resources/wiremock_intro.json
diff --git a/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/CucumberIntegrationTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/cucumber/StepDefinition.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/AbstractStory.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserNotFoundStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponseMediaTypeStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseSteps.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/IncreaseStoryLiveTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java
diff --git a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/ProgrammaticallyManagedLiveTest.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/GithubBasicLiveTest.java
diff --git a/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java b/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
similarity index 100%
rename from rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
rename to testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
diff --git a/rest-testing/src/test/resources/github_user_not_found.story b/testing-modules/rest-testing/src/test/resources/github_user_not_found.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_not_found.story
rename to testing-modules/rest-testing/src/test/resources/github_user_not_found.story
diff --git a/rest-testing/src/test/resources/github_user_response_mediatype.story b/testing-modules/rest-testing/src/test/resources/github_user_response_mediatype.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_response_mediatype.story
rename to testing-modules/rest-testing/src/test/resources/github_user_response_mediatype.story
diff --git a/rest-testing/src/test/resources/github_user_response_payload.story b/testing-modules/rest-testing/src/test/resources/github_user_response_payload.story
similarity index 100%
rename from rest-testing/src/test/resources/github_user_response_payload.story
rename to testing-modules/rest-testing/src/test/resources/github_user_response_payload.story
diff --git a/rest-testing/src/test/resources/increase.story b/testing-modules/rest-testing/src/test/resources/increase.story
similarity index 100%
rename from rest-testing/src/test/resources/increase.story
rename to testing-modules/rest-testing/src/test/resources/increase.story
diff --git a/selenium-junit-testng/README.md b/testing-modules/selenium-junit-testng/README.md
similarity index 100%
rename from selenium-junit-testng/README.md
rename to testing-modules/selenium-junit-testng/README.md
diff --git a/selenium-junit-testng/geckodriver.mac b/testing-modules/selenium-junit-testng/geckodriver.mac
similarity index 100%
rename from selenium-junit-testng/geckodriver.mac
rename to testing-modules/selenium-junit-testng/geckodriver.mac
diff --git a/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml
similarity index 98%
rename from selenium-junit-testng/pom.xml
rename to testing-modules/selenium-junit-testng/pom.xml
index faad194b59..14169e5749 100644
--- a/selenium-junit-testng/pom.xml
+++ b/testing-modules/selenium-junit-testng/pom.xml
@@ -9,6 +9,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>        
     </parent>
 
     <build>
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/config/SeleniumConfig.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/models/BaeldungAbout.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungAboutPage.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/BaeldungHomePage.java
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
similarity index 100%
rename from selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
rename to testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/pages/StartHerePage.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumPageObjectLiveTest.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/SeleniumWithJUnitLiveTest.java
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
similarity index 100%
rename from selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
rename to testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/SeleniumWithTestNGLiveTest.java
diff --git a/testing/README.md b/testing-modules/testing/README.md
similarity index 100%
rename from testing/README.md
rename to testing-modules/testing/README.md
diff --git a/testing/pom.xml b/testing-modules/testing/pom.xml
similarity index 99%
rename from testing/pom.xml
rename to testing-modules/testing/pom.xml
index 8f5c6ddb3d..3ad503558f 100644
--- a/testing/pom.xml
+++ b/testing-modules/testing/pom.xml
@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/testing/src/main/java/com/baeldung/cucumber/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/cucumber/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/cucumber/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/cucumber/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/ScientificCalculator.java
diff --git a/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java b/testing-modules/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/introductionjukito/SimpleCalculator.java
diff --git a/testing/src/main/java/com/baeldung/junit/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/junit/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/junit/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/junit/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java b/testing-modules/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
rename to testing-modules/testing/src/main/java/com/baeldung/junitparams/SafeAdditionUtil.java
diff --git a/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java b/testing-modules/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
rename to testing-modules/testing/src/main/java/com/baeldung/lambdabehave/Calculator.java
diff --git a/testing/src/main/java/com/baeldung/testing/assertj/Dog.java b/testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Dog.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/assertj/Dog.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Dog.java
diff --git a/testing/src/main/java/com/baeldung/testing/assertj/Person.java b/testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Person.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/assertj/Person.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/assertj/Person.java
diff --git a/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java b/testing-modules/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/mutation/Palindrome.java
diff --git a/testing/src/main/java/com/baeldung/testing/truth/User.java b/testing-modules/testing/src/main/java/com/baeldung/testing/truth/User.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/truth/User.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/truth/User.java
diff --git a/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java b/testing-modules/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
similarity index 100%
rename from testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
rename to testing-modules/testing/src/main/java/com/baeldung/testing/truth/UserSubject.java
diff --git a/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/introductionjukito/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/AdditionTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/AdditionTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/AdditionTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/AdditionTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java b/testing-modules/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/BlockingTestRunner.java
diff --git a/testing/src/test/java/com/baeldung/junit/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/SubstractionTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/SubstractionTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/SubstractionTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/SubstractionTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/SuiteTest.java b/testing-modules/testing/src/test/java/com/baeldung/junit/SuiteTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/SuiteTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/SuiteTest.java
diff --git a/testing/src/test/java/com/baeldung/junit/TestRunner.java b/testing-modules/testing/src/test/java/com/baeldung/junit/TestRunner.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junit/TestRunner.java
rename to testing-modules/testing/src/test/java/com/baeldung/junit/TestRunner.java
diff --git a/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java b/testing-modules/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/junitparams/SafeAdditionUtilTest.java
diff --git a/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java b/testing-modules/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
rename to testing-modules/testing/src/test/java/com/baeldung/junitparams/TestDataProvider.java
diff --git a/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java b/testing-modules/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/lambdabehave/CalculatorTest.java
diff --git a/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorIntegrationTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java b/testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/calculator/CalculatorRunSteps.java
diff --git a/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/jgotesting/JGoTestingUnitTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingIntegrationTest.java
diff --git a/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java b/testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/shopping/ShoppingStepsDef.java
diff --git a/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
similarity index 100%
rename from testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
rename to testing-modules/testing/src/test/java/com/baeldung/testing/truth/GoogleTruthUnitTest.java
diff --git a/testing/src/test/resources/JunitParamsTestParameters.csv b/testing-modules/testing/src/test/resources/JunitParamsTestParameters.csv
similarity index 100%
rename from testing/src/test/resources/JunitParamsTestParameters.csv
rename to testing-modules/testing/src/test/resources/JunitParamsTestParameters.csv
diff --git a/testing/src/test/resources/features/calculator-scenario-outline.feature b/testing-modules/testing/src/test/resources/features/calculator-scenario-outline.feature
similarity index 100%
rename from testing/src/test/resources/features/calculator-scenario-outline.feature
rename to testing-modules/testing/src/test/resources/features/calculator-scenario-outline.feature
diff --git a/testing/src/test/resources/features/calculator.feature b/testing-modules/testing/src/test/resources/features/calculator.feature
similarity index 100%
rename from testing/src/test/resources/features/calculator.feature
rename to testing-modules/testing/src/test/resources/features/calculator.feature
diff --git a/testing/src/test/resources/features/shopping.feature b/testing-modules/testing/src/test/resources/features/shopping.feature
similarity index 100%
rename from testing/src/test/resources/features/shopping.feature
rename to testing-modules/testing/src/test/resources/features/shopping.feature
diff --git a/testng/README.md b/testing-modules/testng/README.md
similarity index 100%
rename from testng/README.md
rename to testing-modules/testng/README.md
diff --git a/testng/pom.xml b/testing-modules/testng/pom.xml
similarity index 95%
rename from testng/pom.xml
rename to testing-modules/testng/pom.xml
index 0ca775a00c..f7a50954fc 100644
--- a/testng/pom.xml
+++ b/testing-modules/testng/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/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/DependentLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/GroupIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/GroupIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/GroupIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/GroupIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/MultiThreadedIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/ParametrizedLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/PriorityLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/RegistrationLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SignInLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java b/testing-modules/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SimpleLongRunningUnitTest.java
diff --git a/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/SummationServiceIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java b/testing-modules/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
rename to testing-modules/testng/src/test/java/com/baeldung/TimeOutIntegrationTest.java
diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedListener.java b/testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedListener.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/reports/CustomisedListener.java
rename to testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedListener.java
diff --git a/testng/src/test/java/com/baeldung/reports/CustomisedReports.java b/testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedReports.java
similarity index 100%
rename from testng/src/test/java/com/baeldung/reports/CustomisedReports.java
rename to testing-modules/testng/src/test/java/com/baeldung/reports/CustomisedReports.java
diff --git a/testng/src/test/resources/logback.xml b/testing-modules/testng/src/test/resources/logback.xml
similarity index 100%
rename from testng/src/test/resources/logback.xml
rename to testing-modules/testng/src/test/resources/logback.xml
diff --git a/testng/src/test/resources/parametrized_testng.xml b/testing-modules/testng/src/test/resources/parametrized_testng.xml
similarity index 100%
rename from testng/src/test/resources/parametrized_testng.xml
rename to testing-modules/testng/src/test/resources/parametrized_testng.xml
diff --git a/testng/src/test/resources/reportTemplate.html b/testing-modules/testng/src/test/resources/reportTemplate.html
similarity index 100%
rename from testng/src/test/resources/reportTemplate.html
rename to testing-modules/testng/src/test/resources/reportTemplate.html
diff --git a/testng/src/test/resources/test_group.xml b/testing-modules/testng/src/test/resources/test_group.xml
similarity index 100%
rename from testng/src/test/resources/test_group.xml
rename to testing-modules/testng/src/test/resources/test_group.xml
diff --git a/testng/src/test/resources/test_setup.xml b/testing-modules/testng/src/test/resources/test_setup.xml
similarity index 100%
rename from testng/src/test/resources/test_setup.xml
rename to testing-modules/testng/src/test/resources/test_setup.xml
diff --git a/testng/src/test/resources/test_suite.xml b/testing-modules/testng/src/test/resources/test_suite.xml
similarity index 100%
rename from testng/src/test/resources/test_suite.xml
rename to testing-modules/testng/src/test/resources/test_suite.xml