diff --git a/docker/README.md b/docker-modules/README.md
similarity index 100%
rename from docker/README.md
rename to docker-modules/README.md
diff --git a/docker/docker-caching/multi-module-caching/Dockerfile b/docker-modules/docker-caching/multi-module-caching/Dockerfile
similarity index 100%
rename from docker/docker-caching/multi-module-caching/Dockerfile
rename to docker-modules/docker-caching/multi-module-caching/Dockerfile
diff --git a/docker/docker-caching/multi-module-caching/Dockerfile-Buildkit b/docker-modules/docker-caching/multi-module-caching/Dockerfile-Buildkit
similarity index 100%
rename from docker/docker-caching/multi-module-caching/Dockerfile-Buildkit
rename to docker-modules/docker-caching/multi-module-caching/Dockerfile-Buildkit
diff --git a/docker/docker-caching/multi-module-caching/core/pom.xml b/docker-modules/docker-caching/multi-module-caching/core/pom.xml
similarity index 100%
rename from docker/docker-caching/multi-module-caching/core/pom.xml
rename to docker-modules/docker-caching/multi-module-caching/core/pom.xml
diff --git a/docker/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java b/docker-modules/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java
similarity index 100%
rename from docker/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java
rename to docker-modules/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java
diff --git a/docker/docker-caching/multi-module-caching/pom.xml b/docker-modules/docker-caching/multi-module-caching/pom.xml
similarity index 100%
rename from docker/docker-caching/multi-module-caching/pom.xml
rename to docker-modules/docker-caching/multi-module-caching/pom.xml
diff --git a/docker/docker-caching/multi-module-caching/runner/pom.xml b/docker-modules/docker-caching/multi-module-caching/runner/pom.xml
similarity index 100%
rename from docker/docker-caching/multi-module-caching/runner/pom.xml
rename to docker-modules/docker-caching/multi-module-caching/runner/pom.xml
diff --git a/docker/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java b/docker-modules/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
similarity index 100%
rename from docker/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
rename to docker-modules/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
diff --git a/docker/docker-caching/single-module-caching/Dockerfile b/docker-modules/docker-caching/single-module-caching/Dockerfile
similarity index 100%
rename from docker/docker-caching/single-module-caching/Dockerfile
rename to docker-modules/docker-caching/single-module-caching/Dockerfile
diff --git a/docker/docker-caching/single-module-caching/Dockerfile-Buildkit b/docker-modules/docker-caching/single-module-caching/Dockerfile-Buildkit
similarity index 100%
rename from docker/docker-caching/single-module-caching/Dockerfile-Buildkit
rename to docker-modules/docker-caching/single-module-caching/Dockerfile-Buildkit
diff --git a/docker/docker-caching/single-module-caching/pom.xml b/docker-modules/docker-caching/single-module-caching/pom.xml
similarity index 100%
rename from docker/docker-caching/single-module-caching/pom.xml
rename to docker-modules/docker-caching/single-module-caching/pom.xml
diff --git a/docker/docker-caching/single-module-caching/src/main/java/com/baeldung/maven_caching/MavenCachingMain.java b/docker-modules/docker-caching/single-module-caching/src/main/java/com/baeldung/maven_caching/MavenCachingMain.java
similarity index 100%
rename from docker/docker-caching/single-module-caching/src/main/java/com/baeldung/maven_caching/MavenCachingMain.java
rename to docker-modules/docker-caching/single-module-caching/src/main/java/com/baeldung/maven_caching/MavenCachingMain.java
diff --git a/docker/docker-compose.yml b/docker-modules/docker-compose.yml
similarity index 100%
rename from docker/docker-compose.yml
rename to docker-modules/docker-compose.yml
diff --git a/docker/docker-include-outside-build-context/projects/config/Dockerfile b/docker-modules/docker-include-outside-build-context/projects/config/Dockerfile
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/config/Dockerfile
rename to docker-modules/docker-include-outside-build-context/projects/config/Dockerfile
diff --git a/docker/docker-include-outside-build-context/projects/config/nginx.conf b/docker-modules/docker-include-outside-build-context/projects/config/nginx.conf
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/config/nginx.conf
rename to docker-modules/docker-include-outside-build-context/projects/config/nginx.conf
diff --git a/docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile b/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile
rename to docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile
diff --git a/docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base b/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base
rename to docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-from-base
diff --git a/docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script b/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script
rename to docker-modules/docker-include-outside-build-context/projects/sample-site/docker/Dockerfile-script
diff --git a/docker/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh b/docker-modules/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh
rename to docker-modules/docker-include-outside-build-context/projects/sample-site/docker/build-docker.sh
diff --git a/docker/docker-include-outside-build-context/projects/sample-site/html/index.html b/docker-modules/docker-include-outside-build-context/projects/sample-site/html/index.html
similarity index 100%
rename from docker/docker-include-outside-build-context/projects/sample-site/html/index.html
rename to docker-modules/docker-include-outside-build-context/projects/sample-site/html/index.html
diff --git a/docker/docker-internal-dto/pom.xml b/docker-modules/docker-internal-dto/pom.xml
similarity index 91%
rename from docker/docker-internal-dto/pom.xml
rename to docker-modules/docker-internal-dto/pom.xml
index 09013d2fc3..467d46e7ae 100644
--- a/docker/docker-internal-dto/pom.xml
+++ b/docker-modules/docker-internal-dto/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker</artifactId>
+        <artifactId>docker-modules</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java b/docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
similarity index 100%
rename from docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
rename to docker-modules/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
diff --git a/docker/docker-push-to-private-repo/.gitignore b/docker-modules/docker-push-to-private-repo/.gitignore
similarity index 100%
rename from docker/docker-push-to-private-repo/.gitignore
rename to docker-modules/docker-push-to-private-repo/.gitignore
diff --git a/docker/docker-push-to-private-repo/Dockerfile b/docker-modules/docker-push-to-private-repo/Dockerfile
similarity index 100%
rename from docker/docker-push-to-private-repo/Dockerfile
rename to docker-modules/docker-push-to-private-repo/Dockerfile
diff --git a/docker/docker-push-to-private-repo/README.md b/docker-modules/docker-push-to-private-repo/README.md
similarity index 100%
rename from docker/docker-push-to-private-repo/README.md
rename to docker-modules/docker-push-to-private-repo/README.md
diff --git a/docker/docker-push-to-private-repo/pom.xml b/docker-modules/docker-push-to-private-repo/pom.xml
similarity index 96%
rename from docker/docker-push-to-private-repo/pom.xml
rename to docker-modules/docker-push-to-private-repo/pom.xml
index 19be098794..c45baa65c3 100644
--- a/docker/docker-push-to-private-repo/pom.xml
+++ b/docker-modules/docker-push-to-private-repo/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker</artifactId>
+        <artifactId>docker-modules</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java b/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java
similarity index 100%
rename from docker/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java
rename to docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/HelloWorldController.java
diff --git a/docker/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java b/docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java
similarity index 100%
rename from docker/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java
rename to docker-modules/docker-push-to-private-repo/src/main/java/com/baeldung/docker/push/PushToPrivateRepoApplication.java
diff --git a/docker/docker-push-to-private-repo/src/main/resources/application.properties b/docker-modules/docker-push-to-private-repo/src/main/resources/application.properties
similarity index 100%
rename from docker/docker-push-to-private-repo/src/main/resources/application.properties
rename to docker-modules/docker-push-to-private-repo/src/main/resources/application.properties
diff --git a/docker/docker-sample-app/Dockerfile b/docker-modules/docker-sample-app/Dockerfile
similarity index 100%
rename from docker/docker-sample-app/Dockerfile
rename to docker-modules/docker-sample-app/Dockerfile
diff --git a/docker/docker-sample-app/README.md b/docker-modules/docker-sample-app/README.md
similarity index 100%
rename from docker/docker-sample-app/README.md
rename to docker-modules/docker-sample-app/README.md
diff --git a/docker/docker-sample-app/docker-compose-build-image.yaml b/docker-modules/docker-sample-app/docker-compose-build-image.yaml
similarity index 100%
rename from docker/docker-sample-app/docker-compose-build-image.yaml
rename to docker-modules/docker-sample-app/docker-compose-build-image.yaml
diff --git a/docker/docker-sample-app/docker-compose-with-image.yaml b/docker-modules/docker-sample-app/docker-compose-with-image.yaml
similarity index 100%
rename from docker/docker-sample-app/docker-compose-with-image.yaml
rename to docker-modules/docker-sample-app/docker-compose-with-image.yaml
diff --git a/docker/docker-sample-app/pom.xml b/docker-modules/docker-sample-app/pom.xml
similarity index 96%
rename from docker/docker-sample-app/pom.xml
rename to docker-modules/docker-sample-app/pom.xml
index 24fede56fd..893fb4ebe2 100644
--- a/docker/docker-sample-app/pom.xml
+++ b/docker-modules/docker-sample-app/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker</artifactId>
+        <artifactId>docker-modules</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java b/docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java
similarity index 100%
rename from docker/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java
rename to docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java
diff --git a/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java b/docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java
similarity index 100%
rename from docker/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java
rename to docker-modules/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java
diff --git a/docker/docker-sample-app/src/main/resources/application.properties b/docker-modules/docker-sample-app/src/main/resources/application.properties
similarity index 100%
rename from docker/docker-sample-app/src/main/resources/application.properties
rename to docker-modules/docker-sample-app/src/main/resources/application.properties
diff --git a/docker/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java b/docker-modules/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java
similarity index 100%
rename from docker/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java
rename to docker-modules/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java
diff --git a/docker/docker-spring-boot-postgres/.gitignore b/docker-modules/docker-spring-boot-postgres/.gitignore
similarity index 100%
rename from docker/docker-spring-boot-postgres/.gitignore
rename to docker-modules/docker-spring-boot-postgres/.gitignore
diff --git a/docker/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from docker/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java
rename to docker-modules/docker-spring-boot-postgres/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/docker/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from docker/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar
rename to docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.jar
diff --git a/docker/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties b/docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from docker/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties
rename to docker-modules/docker-spring-boot-postgres/.mvn/wrapper/maven-wrapper.properties
diff --git a/docker/docker-spring-boot-postgres/mvnw b/docker-modules/docker-spring-boot-postgres/mvnw
similarity index 100%
rename from docker/docker-spring-boot-postgres/mvnw
rename to docker-modules/docker-spring-boot-postgres/mvnw
diff --git a/docker/docker-spring-boot-postgres/mvnw.cmd b/docker-modules/docker-spring-boot-postgres/mvnw.cmd
similarity index 100%
rename from docker/docker-spring-boot-postgres/mvnw.cmd
rename to docker-modules/docker-spring-boot-postgres/mvnw.cmd
diff --git a/docker/docker-spring-boot-postgres/pom.xml b/docker-modules/docker-spring-boot-postgres/pom.xml
similarity index 100%
rename from docker/docker-spring-boot-postgres/pom.xml
rename to docker-modules/docker-spring-boot-postgres/pom.xml
diff --git a/docker/docker-spring-boot-postgres/src/main/docker/Dockerfile b/docker-modules/docker-spring-boot-postgres/src/main/docker/Dockerfile
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/docker/Dockerfile
rename to docker-modules/docker-spring-boot-postgres/src/main/docker/Dockerfile
diff --git a/docker/docker-spring-boot-postgres/src/main/docker/docker-compose.yml b/docker-modules/docker-spring-boot-postgres/src/main/docker/docker-compose.yml
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/docker/docker-compose.yml
rename to docker-modules/docker-spring-boot-postgres/src/main/docker/docker-compose.yml
diff --git a/docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/Customer.java b/docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/Customer.java
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/Customer.java
rename to docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/Customer.java
diff --git a/docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/CustomerRepository.java b/docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/CustomerRepository.java
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/CustomerRepository.java
rename to docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/CustomerRepository.java
diff --git a/docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/DemoApplication.java b/docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/DemoApplication.java
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/DemoApplication.java
rename to docker-modules/docker-spring-boot-postgres/src/main/java/com/baeldung/docker/DemoApplication.java
diff --git a/docker/docker-spring-boot-postgres/src/main/resources/application.properties b/docker-modules/docker-spring-boot-postgres/src/main/resources/application.properties
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/main/resources/application.properties
rename to docker-modules/docker-spring-boot-postgres/src/main/resources/application.properties
diff --git a/docker/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java b/docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java
similarity index 100%
rename from docker/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java
rename to docker-modules/docker-spring-boot-postgres/src/test/java/com/baeldung/docker/DemoApplicationTests.java
diff --git a/docker/docker-spring-boot/README.md b/docker-modules/docker-spring-boot/README.md
similarity index 100%
rename from docker/docker-spring-boot/README.md
rename to docker-modules/docker-spring-boot/README.md
diff --git a/docker/docker-spring-boot/pom.xml b/docker-modules/docker-spring-boot/pom.xml
similarity index 97%
rename from docker/docker-spring-boot/pom.xml
rename to docker-modules/docker-spring-boot/pom.xml
index 69d25e374b..22a5e254fe 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker-modules/docker-spring-boot/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker</artifactId>
+        <artifactId>docker-modules</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-spring-boot/src/layers.xml b/docker-modules/docker-spring-boot/src/layers.xml
similarity index 100%
rename from docker/docker-spring-boot/src/layers.xml
rename to docker-modules/docker-spring-boot/src/layers.xml
diff --git a/docker/docker-spring-boot/src/main/docker/Dockerfile b/docker-modules/docker-spring-boot/src/main/docker/Dockerfile
similarity index 100%
rename from docker/docker-spring-boot/src/main/docker/Dockerfile
rename to docker-modules/docker-spring-boot/src/main/docker/Dockerfile
diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile b/docker-modules/docker-spring-boot/src/main/docker/springprofile/Dockerfile
similarity index 100%
rename from docker/docker-spring-boot/src/main/docker/springprofile/Dockerfile
rename to docker-modules/docker-spring-boot/src/main/docker/springprofile/Dockerfile
diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml b/docker-modules/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml
similarity index 100%
rename from docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml
rename to docker-modules/docker-spring-boot/src/main/docker/springprofile/docker-compose-prod.yml
diff --git a/docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml b/docker-modules/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml
similarity index 100%
rename from docker/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml
rename to docker-modules/docker-spring-boot/src/main/docker/springprofile/docker-compose-test.yml
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java b/docker-modules/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
similarity index 100%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
rename to docker-modules/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java b/docker-modules/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
similarity index 100%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
rename to docker-modules/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
diff --git a/docker/docker-spring-boot/src/main/resources/application.properties b/docker-modules/docker-spring-boot/src/main/resources/application.properties
similarity index 100%
rename from docker/docker-spring-boot/src/main/resources/application.properties
rename to docker-modules/docker-spring-boot/src/main/resources/application.properties
diff --git a/docker/dockerfile-with-git/.gitmodules b/docker-modules/dockerfile-with-git/.gitmodules
similarity index 100%
rename from docker/dockerfile-with-git/.gitmodules
rename to docker-modules/dockerfile-with-git/.gitmodules
diff --git a/docker/dockerfile-with-git/Dockerfile b/docker-modules/dockerfile-with-git/Dockerfile
similarity index 100%
rename from docker/dockerfile-with-git/Dockerfile
rename to docker-modules/dockerfile-with-git/Dockerfile
diff --git a/docker/heap-sizing/Dockerfile b/docker-modules/heap-sizing/Dockerfile
similarity index 100%
rename from docker/heap-sizing/Dockerfile
rename to docker-modules/heap-sizing/Dockerfile
diff --git a/docker/heap-sizing/pom.xml b/docker-modules/heap-sizing/pom.xml
similarity index 100%
rename from docker/heap-sizing/pom.xml
rename to docker-modules/heap-sizing/pom.xml
diff --git a/docker/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java b/docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java
similarity index 100%
rename from docker/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java
rename to docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/HeapSizingApplication.java
diff --git a/docker/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java b/docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java
similarity index 100%
rename from docker/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java
rename to docker-modules/heap-sizing/src/main/java/com/baeldung/docker/heapsizing/PrintXmxXms.java
diff --git a/docker/pom.xml b/docker-modules/pom.xml
similarity index 92%
rename from docker/pom.xml
rename to docker-modules/pom.xml
index f46ceac963..87c7960a7f 100644
--- a/docker/pom.xml
+++ b/docker-modules/pom.xml
@@ -4,9 +4,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.docker</groupId>
-    <artifactId>docker</artifactId>
+    <artifactId>docker-modules</artifactId>
     <version>0.0.1</version>
-    <name>docker</name>
+    <name>docker-modules</name>
     <description>Demo project showing Spring Boot and Docker</description>
     <packaging>pom</packaging>
 
diff --git a/pom.xml b/pom.xml
index 8fa7c1e2b4..098dcb328a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
                 <module>cloud-foundry-uaa</module>
                 <module>code-generation</module>
 
-                <module>core-groovy-modules</module>                
+                <module>core-groovy-modules</module>
 
                 <module>core-java-modules</module>
 
@@ -832,7 +832,7 @@
                 <module>code-generation</module>
 
                 <module>core-groovy-modules</module>
-                
+
                 <module>core-java-modules</module>
 
                 <module>couchbase</module>
@@ -1297,7 +1297,7 @@
                  <module>core-java-modules/core-java-strings</module>
                  <module>core-java-modules/core-java-httpclient</module>
                  <module>ddd-contexts</module>
-                 <module>docker</module>
+                 <module>docker-modules</module>
                  <module>apache-httpclient-2</module>
                  <module>libraries-concurrency</module>
                  <module>persistence-modules/sirix</module>
@@ -1365,7 +1365,7 @@
                 <module>core-java-modules/multimodulemavenproject</module>
                 <module>core-java-modules/core-java-strings</module>
                 <module>ddd-contexts</module>
-                <module>docker</module>
+                <module>docker-modules</module>
                 <module>apache-httpclient-2</module>
                 <module>libraries-concurrency</module>
                 <module>persistence-modules/sirix</module>