diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage1.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage1.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage1.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage1.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage1.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage1.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage1.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage1.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage2.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage2.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage2.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage2.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage2.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage2.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage2.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage2.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage3.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage3.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage3.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage3.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage3.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage3.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/Message/UIMessage3.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/Message/UIMessage3.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIBannerTip.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIBannerTip.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIBannerTip.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIBannerTip.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIBannerTip.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIBannerTip.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIBannerTip.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIBannerTip.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIGuidance.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIGuidance.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIGuidance.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIGuidance.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIGuidance.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIGuidance.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UIGuidance.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIGuidance.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UILoading.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UILoading.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UILoading.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UILoading.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UILoading.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UILoading.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUIPanel/UIPopup/UILoading.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UILoading.cs.meta
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIShortcutMenu.cs
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIShortcutMenu.cs
diff --git a/Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs.meta b/Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIShortcutMenu.cs.meta
similarity index 100%
rename from Assets/ModuleCore/ModuleUI/ModuleUISingle/UIShortcutMenu.cs.meta
rename to Assets/ModuleCore/ModuleUI/ModuleUIPanel/Popup/UIShortcutMenu.cs.meta
diff --git a/Assets/ModuleEditor.meta b/Assets/ModuleEditor.meta
deleted file mode 100644
index c95b5d5..0000000
--- a/Assets/ModuleEditor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ed61f5627e04e114eb2c086ae01dc7b4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ModuleEditor/ModuleEditor.asmdef b/Assets/ModuleEditor/ModuleEditor.asmdef
deleted file mode 100644
index d0392dc..0000000
--- a/Assets/ModuleEditor/ModuleEditor.asmdef
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "ModuleEditor",
-    "rootNamespace": "",
-    "references": [
-        "GUID:432b70115e987f44abb984cfe7de384f"
-    ],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}
\ No newline at end of file
diff --git a/Assets/ModuleEditor/ModuleEditor.asmdef.meta b/Assets/ModuleEditor/ModuleEditor.asmdef.meta
deleted file mode 100644
index d459240..0000000
--- a/Assets/ModuleEditor/ModuleEditor.asmdef.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 779534da92936794a829f8bf18309372
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/ModuleEditor/TestEditorWindow.cs b/Assets/ModuleEditor/TestEditorWindow.cs
deleted file mode 100644
index f6fc214..0000000
--- a/Assets/ModuleEditor/TestEditorWindow.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-public class TestEditorWindow : EditorWindow {
-	[SerializeField]
-	private VisualTreeAsset m_VisualTreeAsset = default;
-
-	[MenuItem("Window/MuHua/TestEditorWindow")]
-	public static void ShowExample() {
-		TestEditorWindow wnd = GetWindow<TestEditorWindow>();
-		wnd.titleContent = new GUIContent("TestEditorWindow");
-	}
-
-	public void CreateGUI() {
-		// Each editor window contains a root VisualElement object
-		VisualElement root = rootVisualElement;
-
-		// VisualElements objects can contain other VisualElement following a tree hierarchy.
-		VisualElement label = new Label("Hello World! From C#");
-		root.Add(label);
-
-		// Instantiate UXML
-		VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
-		root.Add(labelFromUXML);
-	}
-}
diff --git a/Assets/ModuleEditor/TestEditorWindow.cs.meta b/Assets/ModuleEditor/TestEditorWindow.cs.meta
deleted file mode 100644
index 02afdda..0000000
--- a/Assets/ModuleEditor/TestEditorWindow.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ccbcb6aee5874ac4ba30fcb269d7c7ba
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_VisualTreeAsset: {fileID: 9197481963319205126, guid: d23b67a16b48c2243aabe57056dbfbed, type: 3}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: