diff --git a/java-collections-maps-2/README.md b/core-java-modules/core-java-collections-maps-2/README.md
similarity index 86%
rename from java-collections-maps-2/README.md
rename to core-java-modules/core-java-collections-maps-2/README.md
index 2188960543..f49ba25c8c 100644
--- a/java-collections-maps-2/README.md
+++ b/core-java-modules/core-java-collections-maps-2/README.md
@@ -13,4 +13,4 @@ This module contains articles about Map data structures in Java.
 - [Sort a HashMap in Java](https://www.baeldung.com/java-hashmap-sort)
 - [Finding the Highest Value in a Java Map](https://www.baeldung.com/java-find-map-max)
 - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
-- More articles: [[<-- prev]](/java-collections-maps) [[next -->]](/java-collections-maps-3)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections-maps) [[next -->]](/core-java-modules/core-java-collections-maps-3)
diff --git a/java-collections-maps-2/pom.xml b/core-java-modules/core-java-collections-maps-2/pom.xml
similarity index 94%
rename from java-collections-maps-2/pom.xml
rename to core-java-modules/core-java-collections-maps-2/pom.xml
index a246559f61..a08a4ac072 100644
--- a/java-collections-maps-2/pom.xml
+++ b/core-java-modules/core-java-collections-maps-2/pom.xml
@@ -3,16 +3,16 @@
          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>java-collections-maps-2</artifactId>
+    <artifactId>core-java-collections-maps-2</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-collections-maps-2</name>
+    <name>core-java-collections-maps-2</name>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/Product.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/Product.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/Product.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/Product.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/convert/MapToString.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/convert/MapToString.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/convert/MapToString.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/convert/MapToString.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/convert/StringToMap.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/convert/StringToMap.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/convert/StringToMap.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/convert/StringToMap.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/copyhashmap/CopyHashMap.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/copyhashmap/CopyHashMap.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/copyhashmap/CopyHashMap.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/copyhashmap/CopyHashMap.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/initialize/MapInitializer.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/initialize/MapInitializer.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/initialize/MapInitializer.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/initialize/MapInitializer.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/iteration/MapIteration.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/iteration/MapIteration.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/iteration/MapIteration.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/iteration/MapIteration.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/mapmax/MapMax.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mapmax/MapMax.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/mapmax/MapMax.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mapmax/MapMax.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/Employee.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/Employee.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/Employee.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/Employee.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/MergeMaps.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/MergeMaps.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/MergeMaps.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/mergemaps/MergeMaps.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/primitives/PrimitiveMaps.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/primitives/PrimitiveMaps.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/primitives/PrimitiveMaps.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/primitives/PrimitiveMaps.java
diff --git a/java-collections-maps-2/src/main/java/com/baeldung/map/sort/SortHashMap.java b/core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/sort/SortHashMap.java
similarity index 100%
rename from java-collections-maps-2/src/main/java/com/baeldung/map/sort/SortHashMap.java
rename to core-java-modules/core-java-collections-maps-2/src/main/java/com/baeldung/map/sort/SortHashMap.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/ProductUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/ProductUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/ProductUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/ProductUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/convert/MapToStringUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/convert/MapToStringUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/convert/MapToStringUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/convert/MapToStringUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/convert/StringToMapUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/convert/StringToMapUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/convert/StringToMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/convert/StringToMapUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/CopyHashMapUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/CopyHashMapUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/CopyHashMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/CopyHashMapUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/Employee.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/Employee.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/Employee.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/copyhashmap/Employee.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/initialize/MapInitializerUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/initialize/MapInitializerUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/initialize/MapInitializerUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/initialize/MapInitializerUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/mapmax/MapMaxUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/mapmax/MapMaxUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/mapmax/MapMaxUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/mapmax/MapMaxUnitTest.java
diff --git a/java-collections-maps-2/src/test/java/com/baeldung/map/weakhashmap/WeakHashMapUnitTest.java b/core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/weakhashmap/WeakHashMapUnitTest.java
similarity index 100%
rename from java-collections-maps-2/src/test/java/com/baeldung/map/weakhashmap/WeakHashMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-2/src/test/java/com/baeldung/map/weakhashmap/WeakHashMapUnitTest.java
diff --git a/java-collections-maps-3/README.md b/core-java-modules/core-java-collections-maps-3/README.md
similarity index 78%
rename from java-collections-maps-3/README.md
rename to core-java-modules/core-java-collections-maps-3/README.md
index 886461a35c..64a3b75d83 100644
--- a/java-collections-maps-3/README.md
+++ b/core-java-modules/core-java-collections-maps-3/README.md
@@ -5,4 +5,4 @@ This module contains articles about Map data structures in Java.
 ### Relevant Articles: 
 - [Java TreeMap vs HashMap](https://www.baeldung.com/java-treemap-vs-hashmap)
 - [Comparing Two HashMaps in Java](https://www.baeldung.com/java-compare-hashmaps)
-- More articles: [[<-- prev]](/java-collections-maps-2)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections-maps-2)
diff --git a/java-collections-maps-3/pom.xml b/core-java-modules/core-java-collections-maps-3/pom.xml
similarity index 78%
rename from java-collections-maps-3/pom.xml
rename to core-java-modules/core-java-collections-maps-3/pom.xml
index 30b0d01528..95414c12c2 100644
--- a/java-collections-maps-3/pom.xml
+++ b/core-java-modules/core-java-collections-maps-3/pom.xml
@@ -3,16 +3,16 @@
          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>java-collections-maps-3</artifactId>
+    <artifactId>core-java-collections-maps-3</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-collections-maps-3</name>
+    <name>core-java-collections-maps-3</name>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/compare/HashMapComparisonUnitTest.java b/core-java-modules/core-java-collections-maps-3/src/test/java/com/baeldung/map/compare/HashMapComparisonUnitTest.java
similarity index 100%
rename from java-collections-maps-3/src/test/java/com/baeldung/map/compare/HashMapComparisonUnitTest.java
rename to core-java-modules/core-java-collections-maps-3/src/test/java/com/baeldung/map/compare/HashMapComparisonUnitTest.java
diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/treemaphashmap/TreeMapVsHashMapUnitTest.java b/core-java-modules/core-java-collections-maps-3/src/test/java/com/baeldung/map/treemaphashmap/TreeMapVsHashMapUnitTest.java
similarity index 100%
rename from java-collections-maps-3/src/test/java/com/baeldung/map/treemaphashmap/TreeMapVsHashMapUnitTest.java
rename to core-java-modules/core-java-collections-maps-3/src/test/java/com/baeldung/map/treemaphashmap/TreeMapVsHashMapUnitTest.java
diff --git a/java-collections-maps/README.md b/core-java-modules/core-java-collections-maps/README.md
similarity index 92%
rename from java-collections-maps/README.md
rename to core-java-modules/core-java-collections-maps/README.md
index 8fa6fa32fa..828f8992e1 100644
--- a/java-collections-maps/README.md
+++ b/core-java-modules/core-java-collections-maps/README.md
@@ -13,4 +13,4 @@ This module contains articles about Map data structures in Java.
 - [Immutable Map Implementations in Java](https://www.baeldung.com/java-immutable-maps) 
 - [Guide to Apache Commons MultiValuedMap](https://www.baeldung.com/apache-commons-multi-valued-map)
 - [The Java HashMap Under the Hood](https://www.baeldung.com/java-hashmap-advanced)
-- More articles: [[next -->]](/java-collections-maps-2)
+- More articles: [[next -->]](/core-java-modules/core-java-collections-maps-2)
diff --git a/java-collections-maps/pom.xml b/core-java-modules/core-java-collections-maps/pom.xml
similarity index 87%
rename from java-collections-maps/pom.xml
rename to core-java-modules/core-java-collections-maps/pom.xml
index 38cf1c38ad..c0dd705c1c 100644
--- a/java-collections-maps/pom.xml
+++ b/core-java-modules/core-java-collections-maps/pom.xml
@@ -2,16 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>java-collections-maps</artifactId>
+    <artifactId>core-java-collections-maps</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>java-collections-maps</name>
+    <name>core-java-collections-maps</name>
     <packaging>jar</packaging>
 
-    <parent>
+   <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 
     <dependencies>
diff --git a/java-collections-maps/src/main/java/com/baeldung/map/MapUtil.java b/core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MapUtil.java
similarity index 100%
rename from java-collections-maps/src/main/java/com/baeldung/map/MapUtil.java
rename to core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MapUtil.java
diff --git a/java-collections-maps/src/main/java/com/baeldung/map/MyKey.java b/core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MyKey.java
similarity index 100%
rename from java-collections-maps/src/main/java/com/baeldung/map/MyKey.java
rename to core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MyKey.java
diff --git a/java-collections-maps/src/main/java/com/baeldung/map/MyLinkedHashMap.java b/core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MyLinkedHashMap.java
similarity index 100%
rename from java-collections-maps/src/main/java/com/baeldung/map/MyLinkedHashMap.java
rename to core-java-modules/core-java-collections-maps/src/main/java/com/baeldung/map/MyLinkedHashMap.java
diff --git a/java-collections-maps/src/main/resources/logback.xml b/core-java-modules/core-java-collections-maps/src/main/resources/logback.xml
similarity index 100%
rename from java-collections-maps/src/main/resources/logback.xml
rename to core-java-modules/core-java-collections-maps/src/main/resources/logback.xml
diff --git a/java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/KeyCheckUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/KeyCheckUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/KeyCheckUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/KeyCheckUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/MapMultipleValuesUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapMultipleValuesUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/MapMultipleValuesUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapMultipleValuesUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/MapUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/MapUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/MapUtilUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapUtilUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/MapUtilUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MapUtilUnitTest.java
diff --git a/java-collections-maps/src/test/java/com/baeldung/map/MultiValuedMapUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MultiValuedMapUnitTest.java
similarity index 100%
rename from java-collections-maps/src/test/java/com/baeldung/map/MultiValuedMapUnitTest.java
rename to core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/MultiValuedMapUnitTest.java
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index ebdb11925b..3fc978a68c 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -42,6 +42,9 @@
         <module>core-java-collections-list</module>
         <module>core-java-collections-list-2</module>
         <module>core-java-collections-list-3</module>
+        <module>core-java-collections-maps</module>
+        <module>core-java-collections-maps-2</module>
+        <module>core-java-collections-maps-3</module>
         <!-- <module>core-java-collections-set</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
 
         <module>core-java-concurrency-2</module>
diff --git a/pom.xml b/pom.xml
index 5602e807b9..8d4632fb3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -453,9 +453,6 @@
 
                 <module>java-collections-conversions</module>
                 <module>java-collections-conversions-2</module>
-                <module>java-collections-maps</module>
-                <module>java-collections-maps-2</module>
-                <module>java-collections-maps-3</module>
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
 
                 <module>javafx</module>
@@ -966,9 +963,6 @@
 
                 <module>java-collections-conversions</module>
                 <module>java-collections-conversions-2</module>
-                <module>java-collections-maps</module>
-                <module>java-collections-maps-2</module>
-                <module>java-collections-maps-3</module>
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
 
                 <module>javafx</module>