diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/Message.java
similarity index 98%
rename from src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java
rename to src/main/java/pro/cloudnode/smp/cloudnodemsg/Message.java
index 8640b4f..ea5b3f9 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/Message.java
@@ -1,4 +1,4 @@
-package pro.cloudnode.smp.cloudnodemsg.message;
+package pro.cloudnode.smp.cloudnodemsg;
 
 import net.kyori.adventure.text.Component;
 import org.bukkit.NamespacedKey;
@@ -8,8 +8,6 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
-import pro.cloudnode.smp.cloudnodemsg.Permission;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
 
 import java.util.Arrays;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java
index bb42c89..c77cc98 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/IgnoreCommand.java
@@ -11,7 +11,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.NeverJoinedError;
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
 import pro.cloudnode.smp.cloudnodemsg.error.NotPlayerError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java
index fc7a500..7977c90 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java
@@ -1,6 +1,5 @@
 package pro.cloudnode.smp.cloudnodemsg.command;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -12,7 +11,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
 import pro.cloudnode.smp.cloudnodemsg.error.PlayerNotFoundError;
 import pro.cloudnode.smp.cloudnodemsg.error.PlayerHasIncomingDisabledError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java
index eb5ee6f..8d61c2e 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java
@@ -10,7 +10,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.NobodyReplyError;
 import pro.cloudnode.smp.cloudnodemsg.error.ReplyOfflineError;
 import pro.cloudnode.smp.cloudnodemsg.error.PlayerHasIncomingDisabledError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java
index 5eab3d3..6f19d41 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java
@@ -10,7 +10,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.NeverJoinedError;
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
 import pro.cloudnode.smp.cloudnodemsg.error.NotPlayerError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java
index a73f96b..d165c38 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/command/UnIgnoreCommand.java
@@ -11,7 +11,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
 import pro.cloudnode.smp.cloudnodemsg.error.NotIgnoredError;
 import pro.cloudnode.smp.cloudnodemsg.error.NotPlayerError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java b/src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java
index ee41bb7..a5890af 100644
--- a/src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java
+++ b/src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java
@@ -12,7 +12,7 @@
 import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
 import pro.cloudnode.smp.cloudnodemsg.Permission;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
-import pro.cloudnode.smp.cloudnodemsg.message.Message;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.HashSet;
 import java.util.Iterator;