diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
index 2f80a8e19..783594ec3 100644
--- a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
+++ b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
 using Lagrange.Core.Common.Entity;
-using Lagrange.OneBot.Core.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs
index 5bc4dffc7..63d8a4185 100644
--- a/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs
+++ b/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 using Lagrange.Core.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
index c03b04cbe..b4ee792a8 100644
--- a/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
+++ b/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Lagrange.OneBot.Core.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs
index d9cfe7268..68a66f371 100644
--- a/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs
+++ b/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
-using Lagrange.OneBot.Core.Message;
-using Lagrange.OneBot.Core.Message.Entity;
+using Lagrange.OneBot.Message;
+using Lagrange.OneBot.Message.Entity;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 
diff --git a/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs b/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs
index eef216724..9e4284ceb 100644
--- a/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs
+++ b/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs
@@ -5,7 +5,7 @@
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Action.Response;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 
 namespace Lagrange.OneBot.Core.Operation.Message;
 
diff --git a/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs b/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs
index a99a3a25b..d2c408ebd 100644
--- a/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs
+++ b/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs
@@ -4,8 +4,8 @@
 using Lagrange.Core.Message;
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Action.Response;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Database;
+using Lagrange.OneBot.Message;
 using LiteDB;
 
 namespace Lagrange.OneBot.Core.Operation.Message;
diff --git a/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs b/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs
index e87c2b1b6..c56428801 100644
--- a/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs
+++ b/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs
@@ -5,7 +5,7 @@
 using Lagrange.Core.Utility.Extension;
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 using LiteDB;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
diff --git a/Lagrange.OneBot/Core/Operation/OperationService.cs b/Lagrange.OneBot/Core/Operation/OperationService.cs
index 7c7afa025..8eb33605c 100644
--- a/Lagrange.OneBot/Core/Operation/OperationService.cs
+++ b/Lagrange.OneBot/Core/Operation/OperationService.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
 using Lagrange.Core;
 using Lagrange.OneBot.Core.Entity.Action;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Operation.Message;
+using Lagrange.OneBot.Message;
 using LiteDB;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
diff --git a/Lagrange.OneBot/LagrangeApp.cs b/Lagrange.OneBot/LagrangeApp.cs
index 78c65ca27..36666d8f3 100644
--- a/Lagrange.OneBot/LagrangeApp.cs
+++ b/Lagrange.OneBot/LagrangeApp.cs
@@ -4,10 +4,10 @@
 using Lagrange.Core.Common.Interface.Api;
 using Lagrange.Core.Utility.Extension;
 using Lagrange.Core.Utility.Sign;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Notify;
 using Lagrange.OneBot.Core.Operation;
+using Lagrange.OneBot.Message;
 using Lagrange.OneBot.Utility;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/Lagrange.OneBot/LagrangeAppBuilder.cs b/Lagrange.OneBot/LagrangeAppBuilder.cs
index de226c2d0..b28e2c092 100644
--- a/Lagrange.OneBot/LagrangeAppBuilder.cs
+++ b/Lagrange.OneBot/LagrangeAppBuilder.cs
@@ -1,11 +1,11 @@
 using Lagrange.Core.Common;
 using Lagrange.Core.Common.Interface;
 using Lagrange.Core.Utility.Sign;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Network.Service;
 using Lagrange.OneBot.Core.Notify;
 using Lagrange.OneBot.Core.Operation;
+using Lagrange.OneBot.Message;
 using Lagrange.OneBot.Utility;
 using LiteDB;
 using Microsoft.Extensions.Configuration;
diff --git a/Lagrange.OneBot/Core/Message/CQPropertyAttribute.cs b/Lagrange.OneBot/Message/CQPropertyAttribute.cs
similarity index 69%
rename from Lagrange.OneBot/Core/Message/CQPropertyAttribute.cs
rename to Lagrange.OneBot/Message/CQPropertyAttribute.cs
index f6f1bde45..a56d15a3a 100644
--- a/Lagrange.OneBot/Core/Message/CQPropertyAttribute.cs
+++ b/Lagrange.OneBot/Message/CQPropertyAttribute.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 [AttributeUsage(AttributeTargets.Property)]
 public class CQPropertyAttribute : Attribute;
\ No newline at end of file
diff --git a/Lagrange.OneBot/Core/Message/Entity/AtSegment.cs b/Lagrange.OneBot/Message/Entity/AtSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/AtSegment.cs
rename to Lagrange.OneBot/Message/Entity/AtSegment.cs
index 782d9ca1f..cece86f9b 100644
--- a/Lagrange.OneBot/Core/Message/Entity/AtSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/AtSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class AtSegment(uint at)
diff --git a/Lagrange.OneBot/Core/Message/Entity/CommonResolver.cs b/Lagrange.OneBot/Message/Entity/CommonResolver.cs
similarity index 93%
rename from Lagrange.OneBot/Core/Message/Entity/CommonResolver.cs
rename to Lagrange.OneBot/Message/Entity/CommonResolver.cs
index d67795129..fb93f75de 100644
--- a/Lagrange.OneBot/Core/Message/Entity/CommonResolver.cs
+++ b/Lagrange.OneBot/Message/Entity/CommonResolver.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 public static class CommonResolver
 {
diff --git a/Lagrange.OneBot/Core/Message/Entity/DiceSegment.cs b/Lagrange.OneBot/Message/Entity/DiceSegment.cs
similarity index 92%
rename from Lagrange.OneBot/Core/Message/Entity/DiceSegment.cs
rename to Lagrange.OneBot/Message/Entity/DiceSegment.cs
index 58b53d74c..5d0df2843 100644
--- a/Lagrange.OneBot/Core/Message/Entity/DiceSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/DiceSegment.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class DiceSegment
diff --git a/Lagrange.OneBot/Core/Message/Entity/FaceSegment.cs b/Lagrange.OneBot/Message/Entity/FaceSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/FaceSegment.cs
rename to Lagrange.OneBot/Message/Entity/FaceSegment.cs
index 5a0ffb6ac..3e2f5d2cc 100644
--- a/Lagrange.OneBot/Core/Message/Entity/FaceSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/FaceSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class FaceSegment(int id)
diff --git a/Lagrange.OneBot/Core/Message/Entity/ForwardSegment.cs b/Lagrange.OneBot/Message/Entity/ForwardSegment.cs
similarity index 94%
rename from Lagrange.OneBot/Core/Message/Entity/ForwardSegment.cs
rename to Lagrange.OneBot/Message/Entity/ForwardSegment.cs
index 9e4c919b5..b00c0dfa8 100644
--- a/Lagrange.OneBot/Core/Message/Entity/ForwardSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/ForwardSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ForwardSegment(string name)
diff --git a/Lagrange.OneBot/Core/Message/Entity/ImageSegment.cs b/Lagrange.OneBot/Message/Entity/ImageSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/ImageSegment.cs
rename to Lagrange.OneBot/Message/Entity/ImageSegment.cs
index f98575a47..bc908b6c8 100644
--- a/Lagrange.OneBot/Core/Message/Entity/ImageSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/ImageSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ImageSegment(string url)
diff --git a/Lagrange.OneBot/Core/Message/Entity/LocationSegment.cs b/Lagrange.OneBot/Message/Entity/LocationSegment.cs
similarity index 98%
rename from Lagrange.OneBot/Core/Message/Entity/LocationSegment.cs
rename to Lagrange.OneBot/Message/Entity/LocationSegment.cs
index 9feccf976..4ac14c22d 100644
--- a/Lagrange.OneBot/Core/Message/Entity/LocationSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/LocationSegment.cs
@@ -4,7 +4,7 @@
 using Lagrange.Core.Message.Entity;
 using Lagrange.OneBot.Core.Entity.Common;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class LocationSegment(float latitude, float longitude)
diff --git a/Lagrange.OneBot/Core/Message/Entity/PokeSegment.cs b/Lagrange.OneBot/Message/Entity/PokeSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/PokeSegment.cs
rename to Lagrange.OneBot/Message/Entity/PokeSegment.cs
index c5c72176f..ce5b7c060 100644
--- a/Lagrange.OneBot/Core/Message/Entity/PokeSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/PokeSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class PokeSegment(uint type)
diff --git a/Lagrange.OneBot/Core/Message/Entity/RecordSegment.cs b/Lagrange.OneBot/Message/Entity/RecordSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/RecordSegment.cs
rename to Lagrange.OneBot/Message/Entity/RecordSegment.cs
index 153a79575..92d316b66 100644
--- a/Lagrange.OneBot/Core/Message/Entity/RecordSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/RecordSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class RecordSegment(string url)
diff --git a/Lagrange.OneBot/Core/Message/Entity/ReplySegment.cs b/Lagrange.OneBot/Message/Entity/ReplySegment.cs
similarity index 97%
rename from Lagrange.OneBot/Core/Message/Entity/ReplySegment.cs
rename to Lagrange.OneBot/Message/Entity/ReplySegment.cs
index 23451ddbf..4bdc358cc 100644
--- a/Lagrange.OneBot/Core/Message/Entity/ReplySegment.cs
+++ b/Lagrange.OneBot/Message/Entity/ReplySegment.cs
@@ -3,7 +3,7 @@
 using Lagrange.Core.Message.Entity;
 using Lagrange.OneBot.Database;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ReplySegment(uint messageId)
diff --git a/Lagrange.OneBot/Core/Message/Entity/RpsSegment.cs b/Lagrange.OneBot/Message/Entity/RpsSegment.cs
similarity index 92%
rename from Lagrange.OneBot/Core/Message/Entity/RpsSegment.cs
rename to Lagrange.OneBot/Message/Entity/RpsSegment.cs
index 191910cb7..6779c3726 100644
--- a/Lagrange.OneBot/Core/Message/Entity/RpsSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/RpsSegment.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class RpsSegment
diff --git a/Lagrange.OneBot/Core/Message/Entity/TextSegment.cs b/Lagrange.OneBot/Message/Entity/TextSegment.cs
similarity index 94%
rename from Lagrange.OneBot/Core/Message/Entity/TextSegment.cs
rename to Lagrange.OneBot/Message/Entity/TextSegment.cs
index 79d868177..bc252ed59 100644
--- a/Lagrange.OneBot/Core/Message/Entity/TextSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/TextSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class TextSegment(string text)
diff --git a/Lagrange.OneBot/Core/Message/Entity/VideoSegment.cs b/Lagrange.OneBot/Message/Entity/VideoSegment.cs
similarity index 95%
rename from Lagrange.OneBot/Core/Message/Entity/VideoSegment.cs
rename to Lagrange.OneBot/Message/Entity/VideoSegment.cs
index a5178ad98..b2e34978d 100644
--- a/Lagrange.OneBot/Core/Message/Entity/VideoSegment.cs
+++ b/Lagrange.OneBot/Message/Entity/VideoSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class VideoSegment(string url)
diff --git a/Lagrange.OneBot/Core/Message/MessageService.cs b/Lagrange.OneBot/Message/MessageService.cs
similarity index 98%
rename from Lagrange.OneBot/Core/Message/MessageService.cs
rename to Lagrange.OneBot/Message/MessageService.cs
index 8b10bd477..45f5cd3b1 100644
--- a/Lagrange.OneBot/Core/Message/MessageService.cs
+++ b/Lagrange.OneBot/Message/MessageService.cs
@@ -2,19 +2,19 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using JsonSerializer = System.Text.Json.JsonSerializer;
 using Lagrange.Core;
 using Lagrange.Core.Event.EventArg;
 using Lagrange.Core.Message;
 using Lagrange.Core.Utility.Extension;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message.Entity;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Database;
+using Lagrange.OneBot.Message.Entity;
 using LiteDB;
 using Microsoft.Extensions.Configuration;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 /// <summary>
 /// The class that converts the OneBot message to/from MessageEntity of Lagrange.Core
diff --git a/Lagrange.OneBot/Core/Message/SegmentBase.cs b/Lagrange.OneBot/Message/SegmentBase.cs
similarity index 88%
rename from Lagrange.OneBot/Core/Message/SegmentBase.cs
rename to Lagrange.OneBot/Message/SegmentBase.cs
index 7a775d934..0528545c4 100644
--- a/Lagrange.OneBot/Core/Message/SegmentBase.cs
+++ b/Lagrange.OneBot/Message/SegmentBase.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using LiteDB;
 
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 public abstract class SegmentBase
 {
diff --git a/Lagrange.OneBot/Core/Message/SegmentSubscriberAttribute.cs b/Lagrange.OneBot/Message/SegmentSubscriberAttribute.cs
similarity index 87%
rename from Lagrange.OneBot/Core/Message/SegmentSubscriberAttribute.cs
rename to Lagrange.OneBot/Message/SegmentSubscriberAttribute.cs
index 7e4e8fecd..2ac6ceec9 100644
--- a/Lagrange.OneBot/Core/Message/SegmentSubscriberAttribute.cs
+++ b/Lagrange.OneBot/Message/SegmentSubscriberAttribute.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 [AttributeUsage(AttributeTargets.Class)]
 public class SegmentSubscriberAttribute(Type entity, string type, string? sendType = null) : Attribute