diff --git a/src/main/java/net/lamgc/cgj/bot/AutoSender.java b/src/main/java/net/lamgc/cgj/bot/AutoSender.java
index e450a84..fa09bf0 100644
--- a/src/main/java/net/lamgc/cgj/bot/AutoSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/AutoSender.java
@@ -1,5 +1,7 @@
 package net.lamgc.cgj.bot;
 
+import net.lamgc.cgj.bot.message.MessageSender;
+
 import java.util.Objects;
 
 /**
diff --git a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java
index d1784f1..9a391be 100644
--- a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java
@@ -1,6 +1,7 @@
 package net.lamgc.cgj.bot;
 
 import com.google.gson.JsonObject;
+import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.pixiv.PixivDownload;
 import net.lamgc.cgj.pixiv.PixivURL;
 import org.slf4j.Logger;
diff --git a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
index 99c46bd..fe1fd15 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
@@ -1,6 +1,6 @@
 package net.lamgc.cgj.bot.event;
 
-import net.lamgc.cgj.bot.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.utils.event.EventObject;
 
 public abstract class MessageEvent implements EventObject, MessageSender {
diff --git a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
index 1977c44..b4b410e 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java
@@ -1,6 +1,6 @@
 package net.lamgc.cgj.bot.event;
 
-import net.lamgc.cgj.bot.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
 import net.lamgc.cgj.bot.message.MiraiMessageSender;
 import net.mamoe.mirai.message.ContactMessage;
diff --git a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
index 6222d6a..a0a37c3 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java
@@ -1,7 +1,7 @@
 package net.lamgc.cgj.bot.event;
 
 import net.lamgc.cgj.bot.BotCode;
-import net.lamgc.cgj.bot.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSource;
 import net.lamgc.cgj.bot.message.SpringCQMessageSender;
 import net.lz1998.cq.event.message.CQDiscussMessageEvent;
diff --git a/src/main/java/net/lamgc/cgj/bot/MessageSender.java b/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java
similarity index 91%
rename from src/main/java/net/lamgc/cgj/bot/MessageSender.java
rename to src/main/java/net/lamgc/cgj/bot/message/MessageSender.java
index c6e9003..759cb51 100644
--- a/src/main/java/net/lamgc/cgj/bot/MessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java
@@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot;
+package net.lamgc.cgj.bot.message;
 
 public interface MessageSender {
 
diff --git a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java b/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java
index 7c84a57..43a5b08 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java
@@ -2,7 +2,6 @@ package net.lamgc.cgj.bot.message;
 
 import com.google.common.base.Strings;
 import net.lamgc.cgj.bot.BotCode;
-import net.lamgc.cgj.bot.MessageSender;
 import net.lamgc.cgj.bot.cache.CacheStore;
 import net.lamgc.cgj.bot.cache.HotDataCacheStore;
 import net.lamgc.cgj.bot.cache.LocalHashCacheStore;
diff --git a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java b/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java
index 37d25dd..d2a05b8 100644
--- a/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java
@@ -1,6 +1,5 @@
 package net.lamgc.cgj.bot.message;
 
-import net.lamgc.cgj.bot.MessageSender;
 import net.lz1998.cq.robot.CoolQ;
 
 public class SpringCQMessageSender implements MessageSender {