diff --git a/gradle-modules/gradle-customization/protobuf/README.md b/gradle-modules/gradle-customization/gradle-protobuf/README.md
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/README.md
rename to gradle-modules/gradle-customization/gradle-protobuf/README.md
diff --git a/gradle-modules/gradle-customization/protobuf/build.gradle b/gradle-modules/gradle-customization/gradle-protobuf/build.gradle
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/build.gradle
rename to gradle-modules/gradle-customization/gradle-protobuf/build.gradle
diff --git a/gradle-modules/gradle-customization/protobuf/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle-customization/gradle-protobuf/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/gradle/wrapper/gradle-wrapper.properties
rename to gradle-modules/gradle-customization/gradle-protobuf/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle-modules/gradle-customization/protobuf/gradlew b/gradle-modules/gradle-customization/gradle-protobuf/gradlew
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/gradlew
rename to gradle-modules/gradle-customization/gradle-protobuf/gradlew
diff --git a/gradle-modules/gradle-customization/protobuf/gradlew.bat b/gradle-modules/gradle-customization/gradle-protobuf/gradlew.bat
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/gradlew.bat
rename to gradle-modules/gradle-customization/gradle-protobuf/gradlew.bat
diff --git a/gradle-modules/gradle-customization/gradle-protobuf/settings.gradle b/gradle-modules/gradle-customization/gradle-protobuf/settings.gradle
new file mode 100644
index 0000000000..8f8b559eb6
--- /dev/null
+++ b/gradle-modules/gradle-customization/gradle-protobuf/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'gradle-protobuf'
diff --git a/gradle-modules/gradle-customization/protobuf/src/main/resources/application.properties b/gradle-modules/gradle-customization/gradle-protobuf/src/main/resources/application.properties
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/src/main/resources/application.properties
rename to gradle-modules/gradle-customization/gradle-protobuf/src/main/resources/application.properties
diff --git a/gradle-modules/gradle-customization/protobuf/src/sample_protofiles/user_message.proto b/gradle-modules/gradle-customization/gradle-protobuf/src/sample_protofiles/user_message.proto
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/src/sample_protofiles/user_message.proto
rename to gradle-modules/gradle-customization/gradle-protobuf/src/sample_protofiles/user_message.proto
diff --git a/gradle-modules/gradle-customization/protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java b/gradle-modules/gradle-customization/gradle-protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java
similarity index 100%
rename from gradle-modules/gradle-customization/protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java
rename to gradle-modules/gradle-customization/gradle-protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java
diff --git a/gradle-modules/gradle-customization/protobuf/settings.gradle b/gradle-modules/gradle-customization/protobuf/settings.gradle
deleted file mode 100644
index 63483bae11..0000000000
--- a/gradle-modules/gradle-customization/protobuf/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'protobuf'
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml b/kubernetes-modules/deployment-and-statefulset-configs/Deployment/Deployment.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Deployment.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/Deployment/Deployment.yaml
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml b/kubernetes-modules/deployment-and-statefulset-configs/Deployment/PersitantVoulumeClaim.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/PersitantVoulumeClaim.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/Deployment/PersitantVoulumeClaim.yaml
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Service.yaml b/kubernetes-modules/deployment-and-statefulset-configs/Deployment/Service.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/Deployment/Service.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/Deployment/Service.yaml
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml b/kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/PersistantVolumeClaim.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/PersistantVolumeClaim.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/PersistantVolumeClaim.yaml
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml b/kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/Service.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/Service.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/Service.yaml
diff --git a/kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml b/kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/StatefulSet.yaml
similarity index 100%
rename from kubernetes-modules/Deployment_Vs_StatefulSet/StatefulSets/StatefulSet.yaml
rename to kubernetes-modules/deployment-and-statefulset-configs/StatefulSets/StatefulSet.yaml
diff --git a/linux-bash-modules/json/README.md b/linux-bash-modules/linux-bash-json/README.md
similarity index 100%
rename from linux-bash-modules/json/README.md
rename to linux-bash-modules/linux-bash-json/README.md
diff --git a/linux-bash-modules/json/src/main/bash/fruit.json b/linux-bash-modules/linux-bash-json/src/main/bash/fruit.json
similarity index 100%
rename from linux-bash-modules/json/src/main/bash/fruit.json
rename to linux-bash-modules/linux-bash-json/src/main/bash/fruit.json
diff --git a/linux-bash-modules/json/src/main/bash/fruits.json b/linux-bash-modules/linux-bash-json/src/main/bash/fruits.json
similarity index 100%
rename from linux-bash-modules/json/src/main/bash/fruits.json
rename to linux-bash-modules/linux-bash-json/src/main/bash/fruits.json
diff --git a/linux-bash-modules/json/src/main/bash/jq.sh b/linux-bash-modules/linux-bash-json/src/main/bash/jq.sh
similarity index 100%
rename from linux-bash-modules/json/src/main/bash/jq.sh
rename to linux-bash-modules/linux-bash-json/src/main/bash/jq.sh
diff --git a/linux-bash-modules/json/src/main/bash/wikipedia.json b/linux-bash-modules/linux-bash-json/src/main/bash/wikipedia.json
similarity index 100%
rename from linux-bash-modules/json/src/main/bash/wikipedia.json
rename to linux-bash-modules/linux-bash-json/src/main/bash/wikipedia.json
diff --git a/linux-bash-modules/loops/README.md b/linux-bash-modules/linux-bash-loops/README.md
similarity index 100%
rename from linux-bash-modules/loops/README.md
rename to linux-bash-modules/linux-bash-loops/README.md
diff --git a/linux-bash-modules/loops/src/main/bash/find_directories.sh b/linux-bash-modules/linux-bash-loops/src/main/bash/find_directories.sh
similarity index 100%
rename from linux-bash-modules/loops/src/main/bash/find_directories.sh
rename to linux-bash-modules/linux-bash-loops/src/main/bash/find_directories.sh
diff --git a/linux-bash-modules/loops/src/main/bash/loop_directories.sh b/linux-bash-modules/linux-bash-loops/src/main/bash/loop_directories.sh
similarity index 100%
rename from linux-bash-modules/loops/src/main/bash/loop_directories.sh
rename to linux-bash-modules/linux-bash-loops/src/main/bash/loop_directories.sh
diff --git a/linux-bash-modules/read/README.md b/linux-bash-modules/linux-bash-read/README.md
similarity index 100%
rename from linux-bash-modules/read/README.md
rename to linux-bash-modules/linux-bash-read/README.md
diff --git a/linux-bash-modules/read/src/main/bash/file.csv b/linux-bash-modules/linux-bash-read/src/main/bash/file.csv
similarity index 100%
rename from linux-bash-modules/read/src/main/bash/file.csv
rename to linux-bash-modules/linux-bash-read/src/main/bash/file.csv
diff --git a/linux-bash-modules/read/src/main/bash/read_inputs.sh b/linux-bash-modules/linux-bash-read/src/main/bash/read_inputs.sh
similarity index 100%
rename from linux-bash-modules/read/src/main/bash/read_inputs.sh
rename to linux-bash-modules/linux-bash-read/src/main/bash/read_inputs.sh
diff --git a/linux-bash-modules/text/README.md b/linux-bash-modules/linux-bash-text/README.md
similarity index 100%
rename from linux-bash-modules/text/README.md
rename to linux-bash-modules/linux-bash-text/README.md
diff --git a/linux-bash-modules/text/src/main/bash/append_multiple_lines.sh b/linux-bash-modules/linux-bash-text/src/main/bash/append_multiple_lines.sh
similarity index 100%
rename from linux-bash-modules/text/src/main/bash/append_multiple_lines.sh
rename to linux-bash-modules/linux-bash-text/src/main/bash/append_multiple_lines.sh
diff --git a/linux-bash-modules/text/src/main/bash/remove_characters.sh b/linux-bash-modules/linux-bash-text/src/main/bash/remove_characters.sh
similarity index 100%
rename from linux-bash-modules/text/src/main/bash/remove_characters.sh
rename to linux-bash-modules/linux-bash-text/src/main/bash/remove_characters.sh