diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/entity/Profile.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
similarity index 88%
rename from guava-collections-map/src/main/java/com/baeldung/guava/entity/Profile.java
rename to guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
index 17a6502f39..165c5a9f8f 100644
--- a/guava-collections-map/src/main/java/com/baeldung/guava/entity/Profile.java
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava.entity;
+package com.baeldung.guava.mapmaker;
 
 public class Profile {
     private long id;
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/entity/Session.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
similarity index 81%
rename from guava-collections-map/src/main/java/com/baeldung/guava/entity/Session.java
rename to guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
index b834c23df1..a614f431f8 100644
--- a/guava-collections-map/src/main/java/com/baeldung/guava/entity/Session.java
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava.entity;
+package com.baeldung.guava.mapmaker;
 
 public class Session {
     private long id;
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/entity/User.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
similarity index 88%
rename from guava-collections-map/src/main/java/com/baeldung/guava/entity/User.java
rename to guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
index 613045ec23..a7f0435049 100644
--- a/guava-collections-map/src/main/java/com/baeldung/guava/entity/User.java
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.guava.entity;
+package com.baeldung.guava.mapmaker;
 
 public class User {
     private long id;
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
index e2bc1349c6..754e3ac099 100644
--- a/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
@@ -1,8 +1,5 @@
 package com.baeldung.guava.mapmaker;
 
-import com.baeldung.guava.entity.Profile;
-import com.baeldung.guava.entity.Session;
-import com.baeldung.guava.entity.User;
 import com.google.common.collect.MapMaker;
 import org.junit.Assert;
 import org.junit.Test;