diff --git a/kubernetes/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml
diff --git a/kubernetes/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml
diff --git a/kubernetes/Deployment_Vs_StatefulSet/Deployment/Service.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Service.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/Deployment/Service.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Service.yaml
diff --git a/kubernetes/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml
diff --git a/kubernetes/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml
diff --git a/kubernetes/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml b/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml
similarity index 100%
rename from kubernetes/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml
rename to kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml
diff --git a/kubernetes/k8s-admission-controller/Dockerfile b/kubernetes-modules/k8s-admission-controller/Dockerfile
similarity index 100%
rename from kubernetes/k8s-admission-controller/Dockerfile
rename to kubernetes-modules/k8s-admission-controller/Dockerfile
diff --git a/kubernetes/k8s-admission-controller/README.md b/kubernetes-modules/k8s-admission-controller/README.md
similarity index 100%
rename from kubernetes/k8s-admission-controller/README.md
rename to kubernetes-modules/k8s-admission-controller/README.md
diff --git a/kubernetes/k8s-admission-controller/pom.xml b/kubernetes-modules/k8s-admission-controller/pom.xml
similarity index 100%
rename from kubernetes/k8s-admission-controller/pom.xml
rename to kubernetes-modules/k8s-admission-controller/pom.xml
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/Application.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/Application.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/Application.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/Application.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/config/AdmissionControllerProperties.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/config/AdmissionControllerProperties.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/config/AdmissionControllerProperties.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/config/AdmissionControllerProperties.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/controller/AdmissionReviewController.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/controller/AdmissionReviewController.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/controller/AdmissionReviewController.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/controller/AdmissionReviewController.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewData.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewData.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewData.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewData.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewException.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewException.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewException.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewException.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewResponse.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewResponse.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewResponse.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionReviewResponse.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionStatus.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionStatus.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionStatus.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/dto/AdmissionStatus.java
diff --git a/kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/service/AdmissionService.java b/kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/service/AdmissionService.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/service/AdmissionService.java
rename to kubernetes-modules/k8s-admission-controller/src/main/java/com/baeldung/kubernetes/admission/service/AdmissionService.java
diff --git a/kubernetes/k8s-admission-controller/src/main/resources/logback.xml b/kubernetes-modules/k8s-admission-controller/src/main/resources/logback.xml
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/main/resources/logback.xml
rename to kubernetes-modules/k8s-admission-controller/src/main/resources/logback.xml
diff --git a/kubernetes/k8s-admission-controller/src/test/java/com/baeldung/kubernetes/admission/service/AdmissionServiceUnitTest.java b/kubernetes-modules/k8s-admission-controller/src/test/java/com/baeldung/kubernetes/admission/service/AdmissionServiceUnitTest.java
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/java/com/baeldung/kubernetes/admission/service/AdmissionServiceUnitTest.java
rename to kubernetes-modules/k8s-admission-controller/src/test/java/com/baeldung/kubernetes/admission/service/AdmissionServiceUnitTest.java
diff --git a/kubernetes/k8s-admission-controller/src/test/k8s/nginx.yaml b/kubernetes-modules/k8s-admission-controller/src/test/k8s/nginx.yaml
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/k8s/nginx.yaml
rename to kubernetes-modules/k8s-admission-controller/src/test/k8s/nginx.yaml
diff --git a/kubernetes/k8s-admission-controller/src/test/resources/logback-test.xml b/kubernetes-modules/k8s-admission-controller/src/test/resources/logback-test.xml
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/resources/logback-test.xml
rename to kubernetes-modules/k8s-admission-controller/src/test/resources/logback-test.xml
diff --git a/kubernetes/k8s-admission-controller/src/test/resources/test1.json b/kubernetes-modules/k8s-admission-controller/src/test/resources/test1.json
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/resources/test1.json
rename to kubernetes-modules/k8s-admission-controller/src/test/resources/test1.json
diff --git a/kubernetes/k8s-admission-controller/src/test/resources/test2.json b/kubernetes-modules/k8s-admission-controller/src/test/resources/test2.json
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/resources/test2.json
rename to kubernetes-modules/k8s-admission-controller/src/test/resources/test2.json
diff --git a/kubernetes/k8s-admission-controller/src/test/resources/test3.json b/kubernetes-modules/k8s-admission-controller/src/test/resources/test3.json
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/resources/test3.json
rename to kubernetes-modules/k8s-admission-controller/src/test/resources/test3.json
diff --git a/kubernetes/k8s-admission-controller/src/test/resources/test4.json b/kubernetes-modules/k8s-admission-controller/src/test/resources/test4.json
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/resources/test4.json
rename to kubernetes-modules/k8s-admission-controller/src/test/resources/test4.json
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/.gitignore b/kubernetes-modules/k8s-admission-controller/src/test/terraform/.gitignore
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/.gitignore
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/.gitignore
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/.terraform.lock.hcl b/kubernetes-modules/k8s-admission-controller/src/test/terraform/.terraform.lock.hcl
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/.terraform.lock.hcl
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/.terraform.lock.hcl
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/component.auto.tfvars b/kubernetes-modules/k8s-admission-controller/src/test/terraform/component.auto.tfvars
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/component.auto.tfvars
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/component.auto.tfvars
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/main.tf b/kubernetes-modules/k8s-admission-controller/src/test/terraform/main.tf
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/main.tf
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/main.tf
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/providers.tf b/kubernetes-modules/k8s-admission-controller/src/test/terraform/providers.tf
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/providers.tf
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/providers.tf
diff --git a/kubernetes/k8s-admission-controller/src/test/terraform/variables.tf b/kubernetes-modules/k8s-admission-controller/src/test/terraform/variables.tf
similarity index 100%
rename from kubernetes/k8s-admission-controller/src/test/terraform/variables.tf
rename to kubernetes-modules/k8s-admission-controller/src/test/terraform/variables.tf
diff --git a/kubernetes/k8s-intro/README.md b/kubernetes-modules/k8s-intro/README.md
similarity index 100%
rename from kubernetes/k8s-intro/README.md
rename to kubernetes-modules/k8s-intro/README.md
diff --git a/kubernetes/k8s-intro/pom.xml b/kubernetes-modules/k8s-intro/pom.xml
similarity index 96%
rename from kubernetes/k8s-intro/pom.xml
rename to kubernetes-modules/k8s-intro/pom.xml
index 067700bdad..86cae401e5 100644
--- a/kubernetes/k8s-intro/pom.xml
+++ b/kubernetes-modules/k8s-intro/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>kubernetes</artifactId>
+        <artifactId>kubernetes-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/kubernetes/k8s-intro/src/k8s/create-http-server.yml b/kubernetes-modules/k8s-intro/src/k8s/create-http-server.yml
similarity index 100%
rename from kubernetes/k8s-intro/src/k8s/create-http-server.yml
rename to kubernetes-modules/k8s-intro/src/k8s/create-http-server.yml
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ApiInvoker.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ApiInvoker.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ApiInvoker.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ApiInvoker.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/AsyncHelper.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/AsyncHelper.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/AsyncHelper.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/AsyncHelper.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodes.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodes.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodes.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodes.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodesAsync.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodesAsync.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodesAsync.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListNodesAsync.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsPaged.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsPaged.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsPaged.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsPaged.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectors.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectors.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectors.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectors.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectors.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectors.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectors.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectors.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithNamespaces.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithNamespaces.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithNamespaces.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/ListPodsWithNamespaces.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/RunJob.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/RunJob.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/RunJob.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/RunJob.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPods.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPods.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPods.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPods.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarks.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarks.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarks.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarks.java
diff --git a/kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersions.java b/kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersions.java
similarity index 100%
rename from kubernetes/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersions.java
rename to kubernetes-modules/k8s-intro/src/main/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersions.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesAsyncLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesAsyncLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesAsyncLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesAsyncLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListNodesLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsPagedLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsPagedLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsPagedLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsPagedLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectorsLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectorsLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectorsLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithFieldSelectorsLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectorsLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectorsLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectorsLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/ListPodsWithLabelSelectorsLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/RunJobLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/RunJobLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/RunJobLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/RunJobLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarksLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarksLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarksLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingBookmarksLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersionsLiveTest.java b/kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersionsLiveTest.java
similarity index 100%
rename from kubernetes/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersionsLiveTest.java
rename to kubernetes-modules/k8s-intro/src/test/java/com/baeldung/kubernetes/intro/WatchPodsUsingResourceVersionsLiveTest.java
diff --git a/kubernetes/k8s-intro/src/test/resources/logback.xml b/kubernetes-modules/k8s-intro/src/test/resources/logback.xml
similarity index 100%
rename from kubernetes/k8s-intro/src/test/resources/logback.xml
rename to kubernetes-modules/k8s-intro/src/test/resources/logback.xml
diff --git a/kubernetes/pom.xml b/kubernetes-modules/pom.xml
similarity index 92%
rename from kubernetes/pom.xml
rename to kubernetes-modules/pom.xml
index 2927d449d8..fe8ffab82a 100644
--- a/kubernetes/pom.xml
+++ b/kubernetes-modules/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>kubernetes</artifactId>
+    <artifactId>kubernetes-modules</artifactId>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/pom.xml b/pom.xml
index 4cfa0ee7ea..5b59303f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,7 +427,7 @@
                 <module>jsf</module>
                 <module>json-modules</module>
                 <module>jsoup</module>
-                <module>kubernetes</module>
+                <module>kubernetes-modules</module>
                 <module>ksqldb</module>
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>language-interop</module>