diff --git a/protocol/src/main/java/mc/protocol/packets/client/ClientSettingsPacket.java b/protocol/src/main/java/mc/protocol/packets/client/ClientSettingsPacket.java
index b78dab3..b22914d 100644
--- a/protocol/src/main/java/mc/protocol/packets/client/ClientSettingsPacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/client/ClientSettingsPacket.java
@@ -1,8 +1,8 @@
 package mc.protocol.packets.client;
 
 import lombok.*;
-import mc.protocol.ChatMode;
-import mc.protocol.MainHand;
+import mc.protocol.utils.ChatMode;
+import mc.protocol.utils.MainHand;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.packets.ClientSidePacket;
 
diff --git a/protocol/src/main/java/mc/protocol/packets/server/JoinGamePacket.java b/protocol/src/main/java/mc/protocol/packets/server/JoinGamePacket.java
index 936bc82..a427359 100644
--- a/protocol/src/main/java/mc/protocol/packets/server/JoinGamePacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/server/JoinGamePacket.java
@@ -1,9 +1,9 @@
 package mc.protocol.packets.server;
 
 import lombok.Data;
-import mc.protocol.Difficulty;
-import mc.protocol.GameMode;
-import mc.protocol.LevelType;
+import mc.protocol.utils.Difficulty;
+import mc.protocol.utils.GameMode;
+import mc.protocol.utils.LevelType;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.packets.ServerSidePacket;
 
diff --git a/protocol/src/main/java/mc/protocol/ChatMode.java b/protocol/src/main/java/mc/protocol/utils/ChatMode.java
similarity index 92%
rename from protocol/src/main/java/mc/protocol/ChatMode.java
rename to protocol/src/main/java/mc/protocol/utils/ChatMode.java
index 33c7bcc..992862a 100644
--- a/protocol/src/main/java/mc/protocol/ChatMode.java
+++ b/protocol/src/main/java/mc/protocol/utils/ChatMode.java
@@ -1,4 +1,4 @@
-package mc.protocol;
+package mc.protocol.utils;
 
 import javax.annotation.Nullable;
 
diff --git a/protocol/src/main/java/mc/protocol/Difficulty.java b/protocol/src/main/java/mc/protocol/utils/Difficulty.java
similarity index 87%
rename from protocol/src/main/java/mc/protocol/Difficulty.java
rename to protocol/src/main/java/mc/protocol/utils/Difficulty.java
index def20c1..dcca038 100644
--- a/protocol/src/main/java/mc/protocol/Difficulty.java
+++ b/protocol/src/main/java/mc/protocol/utils/Difficulty.java
@@ -1,4 +1,4 @@
-package mc.protocol;
+package mc.protocol.utils;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/protocol/src/main/java/mc/protocol/GameMode.java b/protocol/src/main/java/mc/protocol/utils/GameMode.java
similarity index 88%
rename from protocol/src/main/java/mc/protocol/GameMode.java
rename to protocol/src/main/java/mc/protocol/utils/GameMode.java
index b224ea6..eb8b92d 100644
--- a/protocol/src/main/java/mc/protocol/GameMode.java
+++ b/protocol/src/main/java/mc/protocol/utils/GameMode.java
@@ -1,4 +1,4 @@
-package mc.protocol;
+package mc.protocol.utils;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/protocol/src/main/java/mc/protocol/LevelType.java b/protocol/src/main/java/mc/protocol/utils/LevelType.java
similarity index 91%
rename from protocol/src/main/java/mc/protocol/LevelType.java
rename to protocol/src/main/java/mc/protocol/utils/LevelType.java
index 2b99f36..eaa50da 100644
--- a/protocol/src/main/java/mc/protocol/LevelType.java
+++ b/protocol/src/main/java/mc/protocol/utils/LevelType.java
@@ -1,4 +1,4 @@
-package mc.protocol;
+package mc.protocol.utils;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/protocol/src/main/java/mc/protocol/MainHand.java b/protocol/src/main/java/mc/protocol/utils/MainHand.java
similarity index 91%
rename from protocol/src/main/java/mc/protocol/MainHand.java
rename to protocol/src/main/java/mc/protocol/utils/MainHand.java
index 15ea441..3dec589 100644
--- a/protocol/src/main/java/mc/protocol/MainHand.java
+++ b/protocol/src/main/java/mc/protocol/utils/MainHand.java
@@ -1,4 +1,4 @@
-package mc.protocol;
+package mc.protocol.utils;
 
 import javax.annotation.Nullable;
 
diff --git a/server/src/main/java/mc/server/PacketHandler.java b/server/src/main/java/mc/server/PacketHandler.java
index be7786c..f4efb2d 100644
--- a/server/src/main/java/mc/server/PacketHandler.java
+++ b/server/src/main/java/mc/server/PacketHandler.java
@@ -13,6 +13,9 @@ import mc.protocol.packets.client.LoginStartPacket;
 import mc.protocol.packets.client.StatusServerRequestPacket;
 import mc.protocol.packets.server.*;
 import mc.protocol.serializer.TextSerializer;
+import mc.protocol.utils.Difficulty;
+import mc.protocol.utils.GameMode;
+import mc.protocol.utils.LevelType;
 import mc.server.config.Config;
 import org.apache.commons.io.IOUtils;