diff --git a/gradle-modules/README.md b/gradle-modules/README.md
new file mode 100644
index 0000000000..b85789407f
--- /dev/null
+++ b/gradle-modules/README.md
@@ -0,0 +1,3 @@
+## Akka 
+
+This module contains modules about Akka. 
\ No newline at end of file
diff --git a/gradle-5/.gitignore b/gradle-modules/gradle-5/.gitignore
similarity index 100%
rename from gradle-5/.gitignore
rename to gradle-modules/gradle-5/.gitignore
diff --git a/gradle-5/README.md b/gradle-modules/gradle-5/README.md
similarity index 100%
rename from gradle-5/README.md
rename to gradle-modules/gradle-5/README.md
diff --git a/gradle-5/build.gradle b/gradle-modules/gradle-5/build.gradle
similarity index 100%
rename from gradle-5/build.gradle
rename to gradle-modules/gradle-5/build.gradle
diff --git a/gradle-5/cmd-line-args/README.md b/gradle-modules/gradle-5/cmd-line-args/README.md
similarity index 100%
rename from gradle-5/cmd-line-args/README.md
rename to gradle-modules/gradle-5/cmd-line-args/README.md
diff --git a/gradle-5/cmd-line-args/build.gradle b/gradle-modules/gradle-5/cmd-line-args/build.gradle
similarity index 100%
rename from gradle-5/cmd-line-args/build.gradle
rename to gradle-modules/gradle-5/cmd-line-args/build.gradle
diff --git a/gradle-5/cmd-line-args/src/main/java/com/baeldung/cmd/MainClass.java b/gradle-modules/gradle-5/cmd-line-args/src/main/java/com/baeldung/cmd/MainClass.java
similarity index 100%
rename from gradle-5/cmd-line-args/src/main/java/com/baeldung/cmd/MainClass.java
rename to gradle-modules/gradle-5/cmd-line-args/src/main/java/com/baeldung/cmd/MainClass.java
diff --git a/gradle-5/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle-5/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle-5/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle-5/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle-5/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle-5/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle-5/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle-5/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle-5/gradlew b/gradle-modules/gradle-5/gradlew
similarity index 100%
rename from gradle-5/gradlew
rename to gradle-modules/gradle-5/gradlew
diff --git a/gradle-5/gradlew.bat b/gradle-modules/gradle-5/gradlew.bat
similarity index 100%
rename from gradle-5/gradlew.bat
rename to gradle-modules/gradle-5/gradlew.bat
diff --git a/gradle-5/java-exec/.gitignore b/gradle-modules/gradle-5/java-exec/.gitignore
similarity index 100%
rename from gradle-5/java-exec/.gitignore
rename to gradle-modules/gradle-5/java-exec/.gitignore
diff --git a/gradle-5/java-exec/build.gradle b/gradle-modules/gradle-5/java-exec/build.gradle
similarity index 100%
rename from gradle-5/java-exec/build.gradle
rename to gradle-modules/gradle-5/java-exec/build.gradle
diff --git a/gradle-5/java-exec/src/main/java/com/baeldung/gradle/exec/MainClass.java b/gradle-modules/gradle-5/java-exec/src/main/java/com/baeldung/gradle/exec/MainClass.java
similarity index 100%
rename from gradle-5/java-exec/src/main/java/com/baeldung/gradle/exec/MainClass.java
rename to gradle-modules/gradle-5/java-exec/src/main/java/com/baeldung/gradle/exec/MainClass.java
diff --git a/gradle-5/settings.gradle b/gradle-modules/gradle-5/settings.gradle
similarity index 100%
rename from gradle-5/settings.gradle
rename to gradle-modules/gradle-5/settings.gradle
diff --git a/gradle-5/source-sets/.gitignore b/gradle-modules/gradle-5/source-sets/.gitignore
similarity index 100%
rename from gradle-5/source-sets/.gitignore
rename to gradle-modules/gradle-5/source-sets/.gitignore
diff --git a/gradle-5/source-sets/README.md b/gradle-modules/gradle-5/source-sets/README.md
similarity index 100%
rename from gradle-5/source-sets/README.md
rename to gradle-modules/gradle-5/source-sets/README.md
diff --git a/gradle-5/source-sets/build.gradle b/gradle-modules/gradle-5/source-sets/build.gradle
similarity index 100%
rename from gradle-5/source-sets/build.gradle
rename to gradle-modules/gradle-5/source-sets/build.gradle
diff --git a/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java b/gradle-modules/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java
similarity index 100%
rename from gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java
rename to gradle-modules/gradle-5/source-sets/src/itest/java/com/baeldung/itest/SourceSetsItest.java
diff --git a/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java b/gradle-modules/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java
similarity index 100%
rename from gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java
rename to gradle-modules/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsMain.java
diff --git a/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java b/gradle-modules/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java
similarity index 100%
rename from gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java
rename to gradle-modules/gradle-5/source-sets/src/main/java/com/baeldung/main/SourceSetsObject.java
diff --git a/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java b/gradle-modules/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java
similarity index 100%
rename from gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java
rename to gradle-modules/gradle-5/source-sets/src/test/java/com/baeldung/test/SourceSetsTest.java
diff --git a/gradle-5/unused-dependencies/.gitignore b/gradle-modules/gradle-5/unused-dependencies/.gitignore
similarity index 100%
rename from gradle-5/unused-dependencies/.gitignore
rename to gradle-modules/gradle-5/unused-dependencies/.gitignore
diff --git a/gradle-5/unused-dependencies/build.gradle b/gradle-modules/gradle-5/unused-dependencies/build.gradle
similarity index 100%
rename from gradle-5/unused-dependencies/build.gradle
rename to gradle-modules/gradle-5/unused-dependencies/build.gradle
diff --git a/gradle-5/unused-dependencies/src/main/java/com/baeldung/unused/UnusedDependencies.java b/gradle-modules/gradle-5/unused-dependencies/src/main/java/com/baeldung/unused/UnusedDependencies.java
similarity index 100%
rename from gradle-5/unused-dependencies/src/main/java/com/baeldung/unused/UnusedDependencies.java
rename to gradle-modules/gradle-5/unused-dependencies/src/main/java/com/baeldung/unused/UnusedDependencies.java
diff --git a/gradle-6/.gitignore b/gradle-modules/gradle-6/.gitignore
similarity index 100%
rename from gradle-6/.gitignore
rename to gradle-modules/gradle-6/.gitignore
diff --git a/gradle-6/README.md b/gradle-modules/gradle-6/README.md
similarity index 100%
rename from gradle-6/README.md
rename to gradle-modules/gradle-6/README.md
diff --git a/gradle-6/build.gradle.kts b/gradle-modules/gradle-6/build.gradle.kts
similarity index 100%
rename from gradle-6/build.gradle.kts
rename to gradle-modules/gradle-6/build.gradle.kts
diff --git a/gradle-6/configuration-avoidance/build.gradle.kts b/gradle-modules/gradle-6/configuration-avoidance/build.gradle.kts
similarity index 100%
rename from gradle-6/configuration-avoidance/build.gradle.kts
rename to gradle-modules/gradle-6/configuration-avoidance/build.gradle.kts
diff --git a/gradle-6/dependency-constraints/build.gradle.kts b/gradle-modules/gradle-6/dependency-constraints/build.gradle.kts
similarity index 100%
rename from gradle-6/dependency-constraints/build.gradle.kts
rename to gradle-modules/gradle-6/dependency-constraints/build.gradle.kts
diff --git a/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java b/gradle-modules/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java
similarity index 100%
rename from gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java
rename to gradle-modules/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java
diff --git a/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java b/gradle-modules/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java
similarity index 100%
rename from gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java
rename to gradle-modules/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java
diff --git a/gradle-6/fibonacci-recursive/build.gradle.kts b/gradle-modules/gradle-6/fibonacci-recursive/build.gradle.kts
similarity index 100%
rename from gradle-6/fibonacci-recursive/build.gradle.kts
rename to gradle-modules/gradle-6/fibonacci-recursive/build.gradle.kts
diff --git a/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java b/gradle-modules/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java
similarity index 100%
rename from gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java
rename to gradle-modules/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java
diff --git a/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java b/gradle-modules/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java
similarity index 100%
rename from gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java
rename to gradle-modules/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java
diff --git a/gradle-6/fibonacci-spi/build.gradle.kts b/gradle-modules/gradle-6/fibonacci-spi/build.gradle.kts
similarity index 100%
rename from gradle-6/fibonacci-spi/build.gradle.kts
rename to gradle-modules/gradle-6/fibonacci-spi/build.gradle.kts
diff --git a/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java b/gradle-modules/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java
similarity index 100%
rename from gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java
rename to gradle-modules/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java
diff --git a/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java b/gradle-modules/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java
similarity index 100%
rename from gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java
rename to gradle-modules/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java
diff --git a/gradle-6/gradle.properties b/gradle-modules/gradle-6/gradle.properties
similarity index 100%
rename from gradle-6/gradle.properties
rename to gradle-modules/gradle-6/gradle.properties
diff --git a/gradle-6/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle-6/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle-6/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle-6/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle-6/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle-6/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle-6/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle-6/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle-6/gradlew b/gradle-modules/gradle-6/gradlew
similarity index 100%
rename from gradle-6/gradlew
rename to gradle-modules/gradle-6/gradlew
diff --git a/gradle-6/gradlew.bat b/gradle-modules/gradle-6/gradlew.bat
similarity index 100%
rename from gradle-6/gradlew.bat
rename to gradle-modules/gradle-6/gradlew.bat
diff --git a/gradle-6/httpclient-platform/build.gradle.kts b/gradle-modules/gradle-6/httpclient-platform/build.gradle.kts
similarity index 100%
rename from gradle-6/httpclient-platform/build.gradle.kts
rename to gradle-modules/gradle-6/httpclient-platform/build.gradle.kts
diff --git a/gradle-6/module-metadata-publishing/build.gradle.kts b/gradle-modules/gradle-6/module-metadata-publishing/build.gradle.kts
similarity index 100%
rename from gradle-6/module-metadata-publishing/build.gradle.kts
rename to gradle-modules/gradle-6/module-metadata-publishing/build.gradle.kts
diff --git a/gradle-6/person-rest-client/build.gradle.kts b/gradle-modules/gradle-6/person-rest-client/build.gradle.kts
similarity index 100%
rename from gradle-6/person-rest-client/build.gradle.kts
rename to gradle-modules/gradle-6/person-rest-client/build.gradle.kts
diff --git a/gradle-6/settings.gradle.kts b/gradle-modules/gradle-6/settings.gradle.kts
similarity index 100%
rename from gradle-6/settings.gradle.kts
rename to gradle-modules/gradle-6/settings.gradle.kts
diff --git a/gradle-6/widget-rest-client/build.gradle.kts b/gradle-modules/gradle-6/widget-rest-client/build.gradle.kts
similarity index 100%
rename from gradle-6/widget-rest-client/build.gradle.kts
rename to gradle-modules/gradle-6/widget-rest-client/build.gradle.kts
diff --git a/gradle/.gitignore b/gradle-modules/gradle/.gitignore
similarity index 100%
rename from gradle/.gitignore
rename to gradle-modules/gradle/.gitignore
diff --git a/gradle/.travis.yml b/gradle-modules/gradle/.travis.yml
similarity index 100%
rename from gradle/.travis.yml
rename to gradle-modules/gradle/.travis.yml
diff --git a/gradle/README.md b/gradle-modules/gradle/README.md
similarity index 100%
rename from gradle/README.md
rename to gradle-modules/gradle/README.md
diff --git a/gradle/build.gradle b/gradle-modules/gradle/build.gradle
similarity index 100%
rename from gradle/build.gradle
rename to gradle-modules/gradle/build.gradle
diff --git a/gradle/buildSrc/src/main/groovy/com/baeldung/PrintToolVersionBuildSrcTask.groovy b/gradle-modules/gradle/buildSrc/src/main/groovy/com/baeldung/PrintToolVersionBuildSrcTask.groovy
similarity index 100%
rename from gradle/buildSrc/src/main/groovy/com/baeldung/PrintToolVersionBuildSrcTask.groovy
rename to gradle-modules/gradle/buildSrc/src/main/groovy/com/baeldung/PrintToolVersionBuildSrcTask.groovy
diff --git a/gradle/gradle-cucumber/README.md b/gradle-modules/gradle/gradle-cucumber/README.md
similarity index 100%
rename from gradle/gradle-cucumber/README.md
rename to gradle-modules/gradle/gradle-cucumber/README.md
diff --git a/gradle/gradle-cucumber/build.gradle b/gradle-modules/gradle/gradle-cucumber/build.gradle
similarity index 100%
rename from gradle/gradle-cucumber/build.gradle
rename to gradle-modules/gradle/gradle-cucumber/build.gradle
diff --git a/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/gradle-cucumber/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradle-cucumber/gradlew b/gradle-modules/gradle/gradle-cucumber/gradlew
similarity index 100%
rename from gradle/gradle-cucumber/gradlew
rename to gradle-modules/gradle/gradle-cucumber/gradlew
diff --git a/gradle/gradle-cucumber/gradlew.bat b/gradle-modules/gradle/gradle-cucumber/gradlew.bat
similarity index 100%
rename from gradle/gradle-cucumber/gradlew.bat
rename to gradle-modules/gradle/gradle-cucumber/gradlew.bat
diff --git a/gradle/gradle-cucumber/settings.gradle b/gradle-modules/gradle/gradle-cucumber/settings.gradle
similarity index 100%
rename from gradle/gradle-cucumber/settings.gradle
rename to gradle-modules/gradle/gradle-cucumber/settings.gradle
diff --git a/gradle/gradle-cucumber/src/main/java/com/baeldung/Account.java b/gradle-modules/gradle/gradle-cucumber/src/main/java/com/baeldung/Account.java
similarity index 100%
rename from gradle/gradle-cucumber/src/main/java/com/baeldung/Account.java
rename to gradle-modules/gradle/gradle-cucumber/src/main/java/com/baeldung/Account.java
diff --git a/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/RunCucumberTest.java b/gradle-modules/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/RunCucumberTest.java
similarity index 100%
rename from gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/RunCucumberTest.java
rename to gradle-modules/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/RunCucumberTest.java
diff --git a/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/StepDefinitions.java b/gradle-modules/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/StepDefinitions.java
similarity index 100%
rename from gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/StepDefinitions.java
rename to gradle-modules/gradle/gradle-cucumber/src/test/java/com/baeldung/cucumber/StepDefinitions.java
diff --git a/gradle/gradle-cucumber/src/test/resources/features/account_credited.feature b/gradle-modules/gradle/gradle-cucumber/src/test/resources/features/account_credited.feature
similarity index 100%
rename from gradle/gradle-cucumber/src/test/resources/features/account_credited.feature
rename to gradle-modules/gradle/gradle-cucumber/src/test/resources/features/account_credited.feature
diff --git a/gradle/gradle-dependency-management/README.md b/gradle-modules/gradle/gradle-dependency-management/README.md
similarity index 100%
rename from gradle/gradle-dependency-management/README.md
rename to gradle-modules/gradle/gradle-dependency-management/README.md
diff --git a/gradle/gradle-dependency-management/build.gradle b/gradle-modules/gradle/gradle-dependency-management/build.gradle
similarity index 100%
rename from gradle/gradle-dependency-management/build.gradle
rename to gradle-modules/gradle/gradle-dependency-management/build.gradle
diff --git a/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/gradle-dependency-management/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradle-dependency-management/gradlew b/gradle-modules/gradle/gradle-dependency-management/gradlew
similarity index 100%
rename from gradle/gradle-dependency-management/gradlew
rename to gradle-modules/gradle/gradle-dependency-management/gradlew
diff --git a/gradle/gradle-dependency-management/gradlew.bat b/gradle-modules/gradle/gradle-dependency-management/gradlew.bat
similarity index 100%
rename from gradle/gradle-dependency-management/gradlew.bat
rename to gradle-modules/gradle/gradle-dependency-management/gradlew.bat
diff --git a/gradle/gradle-dependency-management/libs/sampleOne.jar b/gradle-modules/gradle/gradle-dependency-management/libs/sampleOne.jar
similarity index 100%
rename from gradle/gradle-dependency-management/libs/sampleOne.jar
rename to gradle-modules/gradle/gradle-dependency-management/libs/sampleOne.jar
diff --git a/gradle/gradle-dependency-management/libs/sampleTwo.jar b/gradle-modules/gradle/gradle-dependency-management/libs/sampleTwo.jar
similarity index 100%
rename from gradle/gradle-dependency-management/libs/sampleTwo.jar
rename to gradle-modules/gradle/gradle-dependency-management/libs/sampleTwo.jar
diff --git a/gradle/gradle-dependency-management/settings.gradle b/gradle-modules/gradle/gradle-dependency-management/settings.gradle
similarity index 100%
rename from gradle/gradle-dependency-management/settings.gradle
rename to gradle-modules/gradle/gradle-dependency-management/settings.gradle
diff --git a/gradle/gradle-dependency-management/src/main/java/com/gradle/dependencymanagement/DependencyManagementApplication.java b/gradle-modules/gradle/gradle-dependency-management/src/main/java/com/gradle/dependencymanagement/DependencyManagementApplication.java
similarity index 100%
rename from gradle/gradle-dependency-management/src/main/java/com/gradle/dependencymanagement/DependencyManagementApplication.java
rename to gradle-modules/gradle/gradle-dependency-management/src/main/java/com/gradle/dependencymanagement/DependencyManagementApplication.java
diff --git a/gradle/gradle-dependency-management/src/main/resources/application.properties b/gradle-modules/gradle/gradle-dependency-management/src/main/resources/application.properties
similarity index 100%
rename from gradle/gradle-dependency-management/src/main/resources/application.properties
rename to gradle-modules/gradle/gradle-dependency-management/src/main/resources/application.properties
diff --git a/gradle/gradle-dependency-management/src/test/java/com/gradle/dependencymanagement/DependencyManagementApplicationUnitTests.java b/gradle-modules/gradle/gradle-dependency-management/src/test/java/com/gradle/dependencymanagement/DependencyManagementApplicationUnitTests.java
similarity index 100%
rename from gradle/gradle-dependency-management/src/test/java/com/gradle/dependencymanagement/DependencyManagementApplicationUnitTests.java
rename to gradle-modules/gradle/gradle-dependency-management/src/test/java/com/gradle/dependencymanagement/DependencyManagementApplicationUnitTests.java
diff --git a/gradle/gradle-employee-app/.gitignore b/gradle-modules/gradle/gradle-employee-app/.gitignore
similarity index 100%
rename from gradle/gradle-employee-app/.gitignore
rename to gradle-modules/gradle/gradle-employee-app/.gitignore
diff --git a/gradle/gradle-employee-app/README.md b/gradle-modules/gradle/gradle-employee-app/README.md
similarity index 100%
rename from gradle/gradle-employee-app/README.md
rename to gradle-modules/gradle/gradle-employee-app/README.md
diff --git a/gradle/gradle-employee-app/build.gradle b/gradle-modules/gradle/gradle-employee-app/build.gradle
similarity index 100%
rename from gradle/gradle-employee-app/build.gradle
rename to gradle-modules/gradle/gradle-employee-app/build.gradle
diff --git a/gradle/gradle-employee-app/settings.gradle b/gradle-modules/gradle/gradle-employee-app/settings.gradle
similarity index 100%
rename from gradle/gradle-employee-app/settings.gradle
rename to gradle-modules/gradle/gradle-employee-app/settings.gradle
diff --git a/gradle/gradle-employee-app/src/main/java/employee/Employee.java b/gradle-modules/gradle/gradle-employee-app/src/main/java/employee/Employee.java
similarity index 100%
rename from gradle/gradle-employee-app/src/main/java/employee/Employee.java
rename to gradle-modules/gradle/gradle-employee-app/src/main/java/employee/Employee.java
diff --git a/gradle/gradle-employee-app/src/main/java/employee/EmployeeApp.java b/gradle-modules/gradle/gradle-employee-app/src/main/java/employee/EmployeeApp.java
similarity index 100%
rename from gradle/gradle-employee-app/src/main/java/employee/EmployeeApp.java
rename to gradle-modules/gradle/gradle-employee-app/src/main/java/employee/EmployeeApp.java
diff --git a/gradle/gradle-employee-app/src/test/java/employee/EmployeeAppTest.java b/gradle-modules/gradle/gradle-employee-app/src/test/java/employee/EmployeeAppTest.java
similarity index 100%
rename from gradle/gradle-employee-app/src/test/java/employee/EmployeeAppTest.java
rename to gradle-modules/gradle/gradle-employee-app/src/test/java/employee/EmployeeAppTest.java
diff --git a/gradle/gradle-fat-jar/README.md b/gradle-modules/gradle/gradle-fat-jar/README.md
similarity index 100%
rename from gradle/gradle-fat-jar/README.md
rename to gradle-modules/gradle/gradle-fat-jar/README.md
diff --git a/gradle/gradle-fat-jar/build.gradle b/gradle-modules/gradle/gradle-fat-jar/build.gradle
similarity index 100%
rename from gradle/gradle-fat-jar/build.gradle
rename to gradle-modules/gradle/gradle-fat-jar/build.gradle
diff --git a/gradle/gradle-fat-jar/settings.gradle b/gradle-modules/gradle/gradle-fat-jar/settings.gradle
similarity index 100%
rename from gradle/gradle-fat-jar/settings.gradle
rename to gradle-modules/gradle/gradle-fat-jar/settings.gradle
diff --git a/gradle/gradle-fat-jar/src/main/java/com/baeldung/fatjar/Application.java b/gradle-modules/gradle/gradle-fat-jar/src/main/java/com/baeldung/fatjar/Application.java
similarity index 100%
rename from gradle/gradle-fat-jar/src/main/java/com/baeldung/fatjar/Application.java
rename to gradle-modules/gradle/gradle-fat-jar/src/main/java/com/baeldung/fatjar/Application.java
diff --git a/gradle/gradle-jacoco/README.md b/gradle-modules/gradle/gradle-jacoco/README.md
similarity index 100%
rename from gradle/gradle-jacoco/README.md
rename to gradle-modules/gradle/gradle-jacoco/README.md
diff --git a/gradle/gradle-jacoco/build.gradle b/gradle-modules/gradle/gradle-jacoco/build.gradle
similarity index 100%
rename from gradle/gradle-jacoco/build.gradle
rename to gradle-modules/gradle/gradle-jacoco/build.gradle
diff --git a/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/gradle-jacoco/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradle-jacoco/gradlew b/gradle-modules/gradle/gradle-jacoco/gradlew
similarity index 100%
rename from gradle/gradle-jacoco/gradlew
rename to gradle-modules/gradle/gradle-jacoco/gradlew
diff --git a/gradle/gradle-jacoco/gradlew.bat b/gradle-modules/gradle/gradle-jacoco/gradlew.bat
similarity index 100%
rename from gradle/gradle-jacoco/gradlew.bat
rename to gradle-modules/gradle/gradle-jacoco/gradlew.bat
diff --git a/gradle/gradle-jacoco/lombok.config b/gradle-modules/gradle/gradle-jacoco/lombok.config
similarity index 100%
rename from gradle/gradle-jacoco/lombok.config
rename to gradle-modules/gradle/gradle-jacoco/lombok.config
diff --git a/gradle/gradle-jacoco/settings.gradle b/gradle-modules/gradle/gradle-jacoco/settings.gradle
similarity index 100%
rename from gradle/gradle-jacoco/settings.gradle
rename to gradle-modules/gradle/gradle-jacoco/settings.gradle
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/config/AppConfig.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/domain/Product.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ExcludedPOJO.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/dto/ProductDTO.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Customer.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/generated/Generated.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/CustomerService.java
diff --git a/gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java b/gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java
similarity index 100%
rename from gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java
rename to gradle-modules/gradle/gradle-jacoco/src/main/java/com/baeldung/service/ProductService.java
diff --git a/gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java b/gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java
similarity index 100%
rename from gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java
rename to gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/CustomerServiceUnitTest.java
diff --git a/gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java b/gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java
similarity index 100%
rename from gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java
rename to gradle-modules/gradle/gradle-jacoco/src/test/java/com/baeldung/service/ProductServiceUnitTest.java
diff --git a/gradle/gradle-jacoco/src/test/resources/features/account_credited.feature b/gradle-modules/gradle/gradle-jacoco/src/test/resources/features/account_credited.feature
similarity index 100%
rename from gradle/gradle-jacoco/src/test/resources/features/account_credited.feature
rename to gradle-modules/gradle/gradle-jacoco/src/test/resources/features/account_credited.feature
diff --git a/gradle/gradle-source-vs-target-compatibility/README.md b/gradle-modules/gradle/gradle-source-vs-target-compatibility/README.md
similarity index 100%
rename from gradle/gradle-source-vs-target-compatibility/README.md
rename to gradle-modules/gradle/gradle-source-vs-target-compatibility/README.md
diff --git a/gradle/gradle-source-vs-target-compatibility/build.gradle b/gradle-modules/gradle/gradle-source-vs-target-compatibility/build.gradle
similarity index 100%
rename from gradle/gradle-source-vs-target-compatibility/build.gradle
rename to gradle-modules/gradle/gradle-source-vs-target-compatibility/build.gradle
diff --git a/gradle/gradle-source-vs-target-compatibility/settings.gradle b/gradle-modules/gradle/gradle-source-vs-target-compatibility/settings.gradle
similarity index 100%
rename from gradle/gradle-source-vs-target-compatibility/settings.gradle
rename to gradle-modules/gradle/gradle-source-vs-target-compatibility/settings.gradle
diff --git a/gradle/gradle-source-vs-target-compatibility/src/main/java/com/baeldung/helloworld/HelloWorldApp.java b/gradle-modules/gradle/gradle-source-vs-target-compatibility/src/main/java/com/baeldung/helloworld/HelloWorldApp.java
similarity index 100%
rename from gradle/gradle-source-vs-target-compatibility/src/main/java/com/baeldung/helloworld/HelloWorldApp.java
rename to gradle-modules/gradle/gradle-source-vs-target-compatibility/src/main/java/com/baeldung/helloworld/HelloWorldApp.java
diff --git a/gradle/gradle-to-maven/README.md b/gradle-modules/gradle/gradle-to-maven/README.md
similarity index 100%
rename from gradle/gradle-to-maven/README.md
rename to gradle-modules/gradle/gradle-to-maven/README.md
diff --git a/gradle/gradle-to-maven/build.gradle b/gradle-modules/gradle/gradle-to-maven/build.gradle
similarity index 100%
rename from gradle/gradle-to-maven/build.gradle
rename to gradle-modules/gradle/gradle-to-maven/build.gradle
diff --git a/gradle/gradle-to-maven/settings.gradle b/gradle-modules/gradle/gradle-to-maven/settings.gradle
similarity index 100%
rename from gradle/gradle-to-maven/settings.gradle
rename to gradle-modules/gradle/gradle-to-maven/settings.gradle
diff --git a/gradle/gradle-wrapper/README.md b/gradle-modules/gradle/gradle-wrapper/README.md
similarity index 100%
rename from gradle/gradle-wrapper/README.md
rename to gradle-modules/gradle/gradle-wrapper/README.md
diff --git a/gradle/gradle-wrapper/gradle/wrapper/README.md b/gradle-modules/gradle/gradle-wrapper/gradle/wrapper/README.md
similarity index 100%
rename from gradle/gradle-wrapper/gradle/wrapper/README.md
rename to gradle-modules/gradle/gradle-wrapper/gradle/wrapper/README.md
diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradle-wrapper/gradlew b/gradle-modules/gradle/gradle-wrapper/gradlew
similarity index 100%
rename from gradle/gradle-wrapper/gradlew
rename to gradle-modules/gradle/gradle-wrapper/gradlew
diff --git a/gradle/gradle-wrapper/gradlew.bat b/gradle-modules/gradle/gradle-wrapper/gradlew.bat
similarity index 100%
rename from gradle/gradle-wrapper/gradlew.bat
rename to gradle-modules/gradle/gradle-wrapper/gradlew.bat
diff --git a/gradle/gradle-wrapper/settings.gradle b/gradle-modules/gradle/gradle-wrapper/settings.gradle
similarity index 100%
rename from gradle/gradle-wrapper/settings.gradle
rename to gradle-modules/gradle/gradle-wrapper/settings.gradle
diff --git a/gradle/gradle/shipkit.gradle b/gradle-modules/gradle/gradle/shipkit.gradle
similarity index 100%
rename from gradle/gradle/shipkit.gradle
rename to gradle-modules/gradle/gradle/shipkit.gradle
diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradletaskdemo/aplugin.gradle b/gradle-modules/gradle/gradletaskdemo/aplugin.gradle
similarity index 100%
rename from gradle/gradletaskdemo/aplugin.gradle
rename to gradle-modules/gradle/gradletaskdemo/aplugin.gradle
diff --git a/gradle/gradletaskdemo/build.gradle b/gradle-modules/gradle/gradletaskdemo/build.gradle
similarity index 100%
rename from gradle/gradletaskdemo/build.gradle
rename to gradle-modules/gradle/gradletaskdemo/build.gradle
diff --git a/gradle/gradlew b/gradle-modules/gradle/gradlew
similarity index 100%
rename from gradle/gradlew
rename to gradle-modules/gradle/gradlew
diff --git a/gradle/gradlew.bat b/gradle-modules/gradle/gradlew.bat
similarity index 100%
rename from gradle/gradlew.bat
rename to gradle-modules/gradle/gradlew.bat
diff --git a/gradle/greeter/.gitignore b/gradle-modules/gradle/greeter/.gitignore
similarity index 100%
rename from gradle/greeter/.gitignore
rename to gradle-modules/gradle/greeter/.gitignore
diff --git a/gradle/greeter/build.gradle b/gradle-modules/gradle/greeter/build.gradle
similarity index 100%
rename from gradle/greeter/build.gradle
rename to gradle-modules/gradle/greeter/build.gradle
diff --git a/gradle/greeter/src/main/java/greeter/Greeter.java b/gradle-modules/gradle/greeter/src/main/java/greeter/Greeter.java
similarity index 100%
rename from gradle/greeter/src/main/java/greeter/Greeter.java
rename to gradle-modules/gradle/greeter/src/main/java/greeter/Greeter.java
diff --git a/gradle/greeter/src/test/java/greetertest/TestGreeting.java b/gradle-modules/gradle/greeter/src/test/java/greetertest/TestGreeting.java
similarity index 100%
rename from gradle/greeter/src/test/java/greetertest/TestGreeting.java
rename to gradle-modules/gradle/greeter/src/test/java/greetertest/TestGreeting.java
diff --git a/gradle/greeting-library-java/.gitignore b/gradle-modules/gradle/greeting-library-java/.gitignore
similarity index 100%
rename from gradle/greeting-library-java/.gitignore
rename to gradle-modules/gradle/greeting-library-java/.gitignore
diff --git a/gradle/greeting-library-java/build.gradle b/gradle-modules/gradle/greeting-library-java/build.gradle
similarity index 100%
rename from gradle/greeting-library-java/build.gradle
rename to gradle-modules/gradle/greeting-library-java/build.gradle
diff --git a/gradle/greeting-library-java/src/main/java/baeldunggreeter/Formatter.java b/gradle-modules/gradle/greeting-library-java/src/main/java/baeldunggreeter/Formatter.java
similarity index 100%
rename from gradle/greeting-library-java/src/main/java/baeldunggreeter/Formatter.java
rename to gradle-modules/gradle/greeting-library-java/src/main/java/baeldunggreeter/Formatter.java
diff --git a/gradle/greeting-library-java/src/test/java/baeldunggreetertest/FormatterTest.java b/gradle-modules/gradle/greeting-library-java/src/test/java/baeldunggreetertest/FormatterTest.java
similarity index 100%
rename from gradle/greeting-library-java/src/test/java/baeldunggreetertest/FormatterTest.java
rename to gradle-modules/gradle/greeting-library-java/src/test/java/baeldunggreetertest/FormatterTest.java
diff --git a/gradle/greeting-library/.gitignore b/gradle-modules/gradle/greeting-library/.gitignore
similarity index 100%
rename from gradle/greeting-library/.gitignore
rename to gradle-modules/gradle/greeting-library/.gitignore
diff --git a/gradle/greeting-library/bin/greeter/GreetingFormatter.groovy b/gradle-modules/gradle/greeting-library/bin/greeter/GreetingFormatter.groovy
similarity index 100%
rename from gradle/greeting-library/bin/greeter/GreetingFormatter.groovy
rename to gradle-modules/gradle/greeting-library/bin/greeter/GreetingFormatter.groovy
diff --git a/gradle/greeting-library/build.gradle b/gradle-modules/gradle/greeting-library/build.gradle
similarity index 100%
rename from gradle/greeting-library/build.gradle
rename to gradle-modules/gradle/greeting-library/build.gradle
diff --git a/gradle/greeting-library/src/main/groovy/greeter/GreetingFormatter.groovy b/gradle-modules/gradle/greeting-library/src/main/groovy/greeter/GreetingFormatter.groovy
similarity index 100%
rename from gradle/greeting-library/src/main/groovy/greeter/GreetingFormatter.groovy
rename to gradle-modules/gradle/greeting-library/src/main/groovy/greeter/GreetingFormatter.groovy
diff --git a/gradle/greeting-library/bin/greeter/GreetingFormatterSpec.groovy b/gradle-modules/gradle/greeting-library/src/test/groovy/greeter/GreetingFormatterSpec.groovy
similarity index 100%
rename from gradle/greeting-library/bin/greeter/GreetingFormatterSpec.groovy
rename to gradle-modules/gradle/greeting-library/src/test/groovy/greeter/GreetingFormatterSpec.groovy
diff --git a/gradle/junit5/README.md b/gradle-modules/gradle/junit5/README.md
similarity index 100%
rename from gradle/junit5/README.md
rename to gradle-modules/gradle/junit5/README.md
diff --git a/gradle/junit5/build.gradle b/gradle-modules/gradle/junit5/build.gradle
similarity index 100%
rename from gradle/junit5/build.gradle
rename to gradle-modules/gradle/junit5/build.gradle
diff --git a/gradle/junit5/settings.gradle b/gradle-modules/gradle/junit5/settings.gradle
similarity index 100%
rename from gradle/junit5/settings.gradle
rename to gradle-modules/gradle/junit5/settings.gradle
diff --git a/gradle/junit5/src/test/java/com/example/CalculatorJUnit4Test.java b/gradle-modules/gradle/junit5/src/test/java/com/example/CalculatorJUnit4Test.java
similarity index 100%
rename from gradle/junit5/src/test/java/com/example/CalculatorJUnit4Test.java
rename to gradle-modules/gradle/junit5/src/test/java/com/example/CalculatorJUnit4Test.java
diff --git a/gradle/junit5/src/test/java/com/example/CalculatorJUnit5Test.java b/gradle-modules/gradle/junit5/src/test/java/com/example/CalculatorJUnit5Test.java
similarity index 100%
rename from gradle/junit5/src/test/java/com/example/CalculatorJUnit5Test.java
rename to gradle-modules/gradle/junit5/src/test/java/com/example/CalculatorJUnit5Test.java
diff --git a/gradle/maven-to-gradle/README.md b/gradle-modules/gradle/maven-to-gradle/README.md
similarity index 100%
rename from gradle/maven-to-gradle/README.md
rename to gradle-modules/gradle/maven-to-gradle/README.md
diff --git a/gradle/maven-to-gradle/build.gradle b/gradle-modules/gradle/maven-to-gradle/build.gradle
similarity index 100%
rename from gradle/maven-to-gradle/build.gradle
rename to gradle-modules/gradle/maven-to-gradle/build.gradle
diff --git a/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.jar b/gradle-modules/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.jar
rename to gradle-modules/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle/maven-to-gradle/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/maven-to-gradle/gradlew b/gradle-modules/gradle/maven-to-gradle/gradlew
similarity index 100%
rename from gradle/maven-to-gradle/gradlew
rename to gradle-modules/gradle/maven-to-gradle/gradlew
diff --git a/gradle/maven-to-gradle/gradlew.bat b/gradle-modules/gradle/maven-to-gradle/gradlew.bat
similarity index 100%
rename from gradle/maven-to-gradle/gradlew.bat
rename to gradle-modules/gradle/maven-to-gradle/gradlew.bat
diff --git a/gradle/maven-to-gradle/pom.xml b/gradle-modules/gradle/maven-to-gradle/pom.xml
similarity index 100%
rename from gradle/maven-to-gradle/pom.xml
rename to gradle-modules/gradle/maven-to-gradle/pom.xml
diff --git a/gradle/maven-to-gradle/settings.gradle b/gradle-modules/gradle/maven-to-gradle/settings.gradle
similarity index 100%
rename from gradle/maven-to-gradle/settings.gradle
rename to gradle-modules/gradle/maven-to-gradle/settings.gradle
diff --git a/gradle/maven-to-gradle/src/main/java/com/sample/javacode/DisplayTime.java b/gradle-modules/gradle/maven-to-gradle/src/main/java/com/sample/javacode/DisplayTime.java
similarity index 100%
rename from gradle/maven-to-gradle/src/main/java/com/sample/javacode/DisplayTime.java
rename to gradle-modules/gradle/maven-to-gradle/src/main/java/com/sample/javacode/DisplayTime.java
diff --git a/gradle/plugin/build.gradle b/gradle-modules/gradle/plugin/build.gradle
similarity index 100%
rename from gradle/plugin/build.gradle
rename to gradle-modules/gradle/plugin/build.gradle
diff --git a/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPlugin.java b/gradle-modules/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPlugin.java
similarity index 100%
rename from gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPlugin.java
rename to gradle-modules/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPlugin.java
diff --git a/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPluginExtension.java b/gradle-modules/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPluginExtension.java
similarity index 100%
rename from gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPluginExtension.java
rename to gradle-modules/gradle/plugin/buildSrc/src/main/java/com/baeldung/GreetingPluginExtension.java
diff --git a/gradle/settings.gradle b/gradle-modules/gradle/settings.gradle
similarity index 100%
rename from gradle/settings.gradle
rename to gradle-modules/gradle/settings.gradle
diff --git a/gradle/version.properties b/gradle-modules/gradle/version.properties
similarity index 100%
rename from gradle/version.properties
rename to gradle-modules/gradle/version.properties
diff --git a/gradle-modules/settings.gradle b/gradle-modules/settings.gradle
new file mode 100644
index 0000000000..a550970612
--- /dev/null
+++ b/gradle-modules/settings.gradle
@@ -0,0 +1,3 @@
+rootProject.name = 'gradle-modules'
+include 'gradletutorial'
+include 'gradle-5-articles'
diff --git a/gradle/greeting-library/src/test/groovy/greeter/GreetingFormatterSpec.groovy b/gradle/greeting-library/src/test/groovy/greeter/GreetingFormatterSpec.groovy
deleted file mode 100644
index f1c1211552..0000000000
--- a/gradle/greeting-library/src/test/groovy/greeter/GreetingFormatterSpec.groovy
+++ /dev/null
@@ -1,13 +0,0 @@
-package greeter
-
-import spock.lang.Specification
-
-class GreetingFormatterSpec extends Specification {
-
-    def 'Creating a greeting'() {
-
-        expect: 'The greeeting to be correctly capitalized'
-        GreetingFormatter.greeting('gradlephant') == 'Hello, Gradlephant'
-
-    }
-}