diff --git a/Server/Server.Model/AEventAttribute.cs b/Server/Server.Model/Event/AEventAttribute.cs
similarity index 100%
rename from Server/Server.Model/AEventAttribute.cs
rename to Server/Server.Model/Event/AEventAttribute.cs
diff --git a/Server/Server.Model/EntityType.cs b/Server/Server.Model/Event/EntityType.cs
similarity index 100%
rename from Server/Server.Model/EntityType.cs
rename to Server/Server.Model/Event/EntityType.cs
diff --git a/Server/Server.Model/Env.cs b/Server/Server.Model/Event/Env.cs
similarity index 100%
rename from Server/Server.Model/Env.cs
rename to Server/Server.Model/Event/Env.cs
diff --git a/Server/Server.Model/EnvKey.cs b/Server/Server.Model/Event/EnvKey.cs
similarity index 100%
rename from Server/Server.Model/EnvKey.cs
rename to Server/Server.Model/Event/EnvKey.cs
diff --git a/Server/Server.Model/EventAttribute.cs b/Server/Server.Model/Event/EventAttribute.cs
similarity index 100%
rename from Server/Server.Model/EventAttribute.cs
rename to Server/Server.Model/Event/EventAttribute.cs
diff --git a/Server/Server.Model/Event/EventIdType.cs b/Server/Server.Model/Event/EventIdType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a280b3e6a2ee0ce846bed65ef21f6fc9b5170d1e
--- /dev/null
+++ b/Server/Server.Model/Event/EventIdType.cs
@@ -0,0 +1,7 @@
+namespace Base
+{
+    public enum EventIdType
+    {
+		NetworkChannelError,
+	}
+}
\ No newline at end of file
diff --git a/Server/Server.Model/IEvent.cs b/Server/Server.Model/Event/IEvent.cs
similarity index 100%
rename from Server/Server.Model/IEvent.cs
rename to Server/Server.Model/Event/IEvent.cs
diff --git a/Server/Server.Model/EventIdType.cs b/Server/Server.Model/EventIdType.cs
deleted file mode 100644
index 63c4acd06ef1372b63ae963c6d44769572d2e07a..0000000000000000000000000000000000000000
--- a/Server/Server.Model/EventIdType.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-namespace Base
-{
-    public enum EventIdType
-    {
-        NumbericChange,
-        PlayerAttrChange,
-        ReloadConfigFinish,
-        PositionChange,
-        ReLoadConfigFinish,
-        PlayerControlUnitCreated,
-        TopInfoHeadIconClick,
-        TopInfoHeadIconDoubleClick,
-        UnitRefreshSkill,
-        ErrorLog,
-        NetworkChannelError,
-        UnitCreate,
-        UnitAddSkill,
-        UnitRemoveSkill,
-        CameraLoadComplete,
-        InitSceneStart,
-        SceneInit,
-        LoadingSceneStart,
-        LoadingSceneUpdate,
-        LauncherSceneStart,
-        LauncherSceneUpdate,
-        LauncherStartUpdateLauncher,
-        LauncherStartUpdateGame,
-		
-        MouseRightButtonDown,
-        MouseLeftButtonDown,
-        MouseRightButtonDownClickUnit,
-        MouseRightButtonDownClickMap,
-        MouseLeftButtonDownClickUnit,
-        MouseLiftButtonDownClickMap,
-        MouseButtonDown,
-
-        MouseLeftButtonUp,
-        MouseRightButtonUp,
-
-        MouseLongClick,
-		
-        BuffSetExpiration,
-
-        /// <summary>
-        /// 这个事件发生在Buff被移除之前
-        /// </summary>
-        UnitUpdateBuff,
-
-        UnitBuffAdd,
-        Ping,
-        SmallMapLeftDragEvent,
-        PlayCombatNumber,
-
-        /// <summary>
-        /// 在Unit被移除之前
-        /// </summary>
-        UnitRemoveEvent,
-
-        UnitAddItem,
-        UnitRemoveItem,
-        UnitSwapItemLoc,
-        UnitItemUpdateCharges,
-        UnitAfterRemoveItem,
-        OnSendSkillShakingEvent,
-        HideOtherInfoPanel,
-        UnitSkillLevelUp,
-
-
-        UnitReborn,
-
-        UnitItemUpdate,
-
-        RecvS2C_StartPickHero,
-        UnitDead,
-		
-        PlayerSignalComponentUpdate,
-
-        UnitIntoGrass,
-        UnitExitGrass,
-        UnitVisibleTypeChange,
-
-        CustomProfileReceive,
-        SelectHero,
-        UnitBuffDispose,
-
-        SkillPanelDown,
-        Herokilled,
-        UnitHited,
-        QualityLevelChange,
-        BreakChannelSkill,
-        UnitRemove,
-        SkillShakingError,
-
-        PortalChangeShowSystemNoticeRun,
-        HeroDeathShowSystemNoticeRun,
-        UnitRemoveShowSystemNoticeRun,
-        OutputToChatNodeRun,
-        EffectFactory,
-        LoadingFinishStartGame,
-		LoadingFinishStartGame_Map4C,
-
-		PortalStateChange,
-        HPVisibleChange,
-        PlayerNameVisibleChange,
-        ShopItemButtonOnHover,
-        OtherPnaelItemBtnOnHover,
-        SettlementItemBtnOnHover,
-        ItemShopItemButtonOnHover,
-        TabItemButtonOnHover,
-        EquippedItemButtonOnHover,
-        BagItemButtonOnHover,
-        CreateEffectInSmallMapNode,
-        ActorDetailInfoSettingBtnOnUp,
-        ChangeSkillsIconEffectStateNodeRun,
-        HallTipsUICloseBtnClickToHall,
-        LoginUIRegisterBtnOnClick,
-        LobbyBottomTaskBtnOnUp,
-        LobbyBottomMessageBtnOnUp,
-        ShowKillReport,
-        KillReportEvent,
-        //收到服务器封包
-        RecvS2C_ActorDetailInfo,
-        RecvS2C_GameOverJieSuan,
-        RecvS2C_UnitReborn,
-        RecvS2C_UpdateRoomInfo,
-        RecvS2C_QuitGroup,
-        RecvS2C_DownloadMapProcess,
-        RecvS2C_JoinGroup,
-        RecvS2C_PlatformBuff,
-        RecvS2C_RequestSurrender,
-        RecvS2C_UnitDieReborn,
-        RecvS2C_PlayerSelectHero,
-        RecvS2C_RegisterAccount,
-        RecvS2C_StartLoading,
-        RecvS2C_SkillBreakChannel,
-        RecvS2C_SkillEnterChannel,
-        RecvS2C_LoginGateSucceedNameSummoner,
-        RecvS2C_LoginGateSucceedReconnectGame,
-        RecvS2C_ReconnectBattleServer,
-        RecvS2C_MapState,
-        ChangeToLobbyFinish,
-        ChangeToLoginFinish,
-        InitSceneStartChangeToLoginFinish,
-        InitSceneStartLoadBundleFinish,
-        ChangeNameSucceed,
-        FriendQueryPlayerFinish,
-        FriendsCommonMenuPersonalInfoButtonUp,
-        FriendsMenuFriendInfoButtonClick,
-        FriendsMenuUIButton1Click,
-        MainChatManagerViewInfoButtonClick,
-        NewLobbyTopPanelHeadButtonClick,
-        SettlementUIStatisticsBtnClick,
-        LobbyTopBuffIconOnHover,
-        SettlementExpCardBtnOnHover,
-        SettlementGoldCardBtnOnHover,
-        NewLobbyLogoButtonUp,
-        NewLobbyHomeButtonUp,
-        FriendsCommonMenuUIMenuBtnOnUp,
-        RecvS2C_StartGame,
-        RecvS2C_GetFriendList,
-        RecvS2C_NotifyDeleteFriend,
-        RecvS2C_UpdateFriendStatus,
-        RecvS2C_ModifyFaction,
-        RecvS2C_UnitDestroy,
-        LoabbyUIOnShowPanel,
-        LoabbyUIBackToPreviousOnShowPanel,
-        LoabbyUIOnShowMainPanel,
-        PlayerLeaveRoom,
-        PlayMatchingUIReturnLobbyBtnOnClick,
-        LobbyUIStartGameBtnOnClick,
-        SettlementUIAddFriendBtnOnHover,
-        SettlementUILikeBtnOnHover,
-        SettlementUITagsEnumBtnOnHover,
-        SettlementUIBlacklistBtnOnHover,
-        SettlementUIReportBtnOnHover,
-        OtherPanelADBtnOnHover,
-        OtherPanelMasteryBtnOnHover,
-        OtherPanelAttackSpeedBtnOnHover,
-        OtherPanelSpeedBtnOnHover,
-        OtherPanelADDefanceBtnOnHover,
-        OtherPanelAPDefanceBtnOnHover,
-        OtherPanelCDRatioBtnOnHover,
-        OtherPanelPhysicalCritPercentBtnOnHover,
-        MyNumericUIAttackDamageBtnOnHover,
-        MyNumericUIMasteryBtnOnHover,
-        MyNumericUIPhysicalArmorBtnOnHover,
-        MyNumericUIMagicArmorBtnOnHover,
-        MyNumericUIAttackSpeedBtnOnHover,
-        MyNumericUICDRatioBtnOnHover,
-        MyNumericUIPhysicalCritPercentBtnOnHover,
-        MyNumericUIMoveSpeedBtnOnHover,
-        BuffIconOnHoverByBuffPanelUI,
-        BuffIconOnHoverByBuffIconUI,
-        RemoveBuffSucceedByOtherPanelUI,
-        RemoveBuffSucceedByBuffPanelUI,
-        BuffEffectSlientEnter,
-        BuffEffectSlientExit,
-        DisplayItemShopNodeRun,
-        UpdateShopUINodeRun,
-        SkillPanelGoldBtnOnClick,
-        SkillPanelShopBtnOnClick,
-        SurrenderBtnActive,
-        GameSettingUIToggleChanged,
-        HotKeySettingButtonOnConfirm,
-        SettingPanelConfirmBtnOnClick,
-        UIOtherPanelRefreshBuff,
-        WildIconVisible,
-        CreateEffectInSmallMapNodeRun,
-        MoveCameraLimitToBorder,
-        MiniIconVisible,
-        StartCastSkill,
-        HallTipsUICloseBtnClickToLogin,
-		MapBundleDownloaderABundle,
-		LoginBundleDownloaderABundle,
-        MessageHandleFriendRequest,
-        MessageHandleGroupInviteRequest,
-        MessageGroupRefresh,
-        MessageGroupItemClearMsg,
-        MessageGroupItemClearBtnOnUp,
-        MessageDetailItemAcceptBtnOnUp,
-        MessageDetailItemRefuseBtnOnUp,
-        MessagePopPanelAcceptBtnOnUp,
-        MessagePopPanelRefuseBtnOnUp,
-        MessageTeamPanelAcceptBtnOnUp,
-        MessageTeamPanelRefuseBtnOnUp,
-        MessageTeamItemAcceptBtnOnUp,
-        MessageTeamItemRefuseBtnOnUp,
-        //behavior tree editor event
-
-        // BehaviorTreeEvent_RunTree,
-        BehaviorTreeRunTreeEvent,
-        BehaviorTreeOpenEditor,
-        BehaviorTreeClickNode,
-        BehaviorTreeAfterChangeNodeType,
-        BehaviorTreeCreateNode,
-        BehaviorTreePropertyDesignerNewCreateClick,
-        BehaviorTreeMouseInNode,
-        BehaviorTreeConnectState,
-        BehaviorTreeReplaceClick,
-        BehaviorTreeRightDesignerDrag,
-        //
-        ShowSystemNoticeRun,
-
-		LogError,
-        BuffEffectWindowEditor,
-        BuffEffectBehaviorTreeEditor,
-        BehaviourTreeEditor,
-        SkillActionWindow,
-        SkillEffectWindowEditor,
-    }
-}
\ No newline at end of file
diff --git a/Server/Server.Model/AMEvent.cs b/Server/Server.Model/Message/AMEvent.cs
similarity index 100%
rename from Server/Server.Model/AMEvent.cs
rename to Server/Server.Model/Message/AMEvent.cs
diff --git a/Server/Server.Model/Server.Model.csproj b/Server/Server.Model/Server.Model.csproj
index 2504be2bb732bdfc13b167f48d79e0a91878997c..59b60654dda66055d09ff0e921828d1cfa16af94 100644
--- a/Server/Server.Model/Server.Model.csproj
+++ b/Server/Server.Model/Server.Model.csproj
@@ -46,8 +46,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AEventAttribute.cs" />
-    <Compile Include="AMEvent.cs" />
+    <Compile Include="Event\AEventAttribute.cs" />
+    <Compile Include="Message\AMEvent.cs" />
     <Compile Include="Component\EventComponent.cs" />
     <Compile Include="Component\MessageHandlerComponent.cs" />
     <Compile Include="Component\MessageComponent.cs" />
@@ -55,15 +55,15 @@
     <Compile Include="Component\Scene.cs" />
     <Compile Include="Component\TimeComponent.cs" />
     <Compile Include="Component\TimerComponent.cs" />
-    <Compile Include="EntityType.cs" />
-    <Compile Include="Env.cs" />
-    <Compile Include="EnvKey.cs" />
+    <Compile Include="Event\EntityType.cs" />
+    <Compile Include="Event\Env.cs" />
+    <Compile Include="Event\EnvKey.cs" />
     <Compile Include="Message\ErrorCode.cs" />
-    <Compile Include="EventAttribute.cs" />
-    <Compile Include="EventIdType.cs" />
+    <Compile Include="Event\EventAttribute.cs" />
+    <Compile Include="Event\EventIdType.cs" />
     <Compile Include="GameException.cs" />
     <Compile Include="Message\IErrorMessage.cs" />
-    <Compile Include="IEvent.cs" />
+    <Compile Include="Event\IEvent.cs" />
     <Compile Include="Message\IMRegister.cs" />
     <Compile Include="Message\Message.cs" />
     <Compile Include="Message\MessageAttribute.cs" />