diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapper.java
index facec8a..6cf7e98 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapper.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapper.java
@@ -24,8 +24,8 @@ package io.github.jwdeveloper.tiktok.mappers;
 
 import com.google.protobuf.GeneratedMessageV3;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingAction;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 
 import java.util.function.Function;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java
index cbb32fc..f198832 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java
@@ -1,9 +1,9 @@
 package io.github.jwdeveloper.tiktok.mappers;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.mappers.events.AfterMappingAction;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingAction;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.AfterMappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/AfterMappingAction.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java
similarity index 89%
rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/AfterMappingAction.java
rename to API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java
index ac296dd..fe13206 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/AfterMappingAction.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java
@@ -1,4 +1,4 @@
-package io.github.jwdeveloper.tiktok.mappers.events;
+package io.github.jwdeveloper.tiktok.mappers.data;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingAction.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java
similarity index 91%
rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingAction.java
rename to API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java
index 751d77c..3ed0b99 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingAction.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java
@@ -1,4 +1,4 @@
-package io.github.jwdeveloper.tiktok.mappers.events;
+package io.github.jwdeveloper.tiktok.mappers.data;
 
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingResult.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java
similarity index 92%
rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingResult.java
rename to API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java
index a2dffc4..f904dcc 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/events/MappingResult.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java
@@ -1,4 +1,4 @@
-package io.github.jwdeveloper.tiktok.mappers.events;
+package io.github.jwdeveloper.tiktok.mappers.data;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import lombok.AllArgsConstructor;
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
index ce325f8..0fc314f 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
@@ -54,9 +54,9 @@ import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
 import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapper;
-import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapperUtils;
+import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapperHelper;
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokCommonEventHandler;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler;
@@ -188,7 +188,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
     public TikTokLiveMapper createMapper(GiftManager giftManager, TikTokRoomInfo roomInfo) {
         var eventMapper = new TikTokGenericEventMapper();
-        var mapper = new TikTokLiveMapper(new TikTokLiveMapperUtils(eventMapper));
+        var mapper = new TikTokLiveMapper(new TikTokLiveMapperHelper(eventMapper));
 
         //ConnectionEvents events
         var commonHandler = new TikTokCommonEventHandler();
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
index 0bca80b..d4ca55a 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
@@ -24,8 +24,8 @@ package io.github.jwdeveloper.tiktok.mappers;
 
 import com.google.protobuf.GeneratedMessageV3;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingAction;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperUtils.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
similarity index 93%
rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperUtils.java
rename to Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
index 15e00e9..bb3cd2d 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperUtils.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
@@ -6,10 +6,10 @@ import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
 import io.github.jwdeveloper.tiktok.utils.ProtocolUtils;
 
-public class TikTokLiveMapperUtils implements TikTokMapperHelper {
+public class TikTokLiveMapperHelper implements TikTokMapperHelper {
     private final TikTokGenericEventMapper genericMapper;
 
-    public TikTokLiveMapperUtils(TikTokGenericEventMapper genericMapper) {
+    public TikTokLiveMapperHelper(TikTokGenericEventMapper genericMapper) {
         this.genericMapper = genericMapper;
     }
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java
index 4785fd7..c4f3b69 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java
@@ -1,8 +1,8 @@
 package io.github.jwdeveloper.tiktok.mappers;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingAction;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java
index 2b72304..9667abd 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java
@@ -31,7 +31,7 @@ import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.SneakyThrows;
 import sun.misc.Unsafe;
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java
index 3e59131..b8d14d9 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java
@@ -32,7 +32,7 @@ import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
 import io.github.jwdeveloper.tiktok.data.models.RankingUser;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLiveIntroMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java
index 841788a..05fe752 100644
--- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java
+++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java
@@ -23,7 +23,7 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.mappers.events.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage;
 
 public class CustomMappingExample {