diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs b/Assets/GameMain/Scripts/Presentation/Common/CommonButton.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs
rename to Assets/GameMain/Scripts/Presentation/Common/CommonButton.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/CommonButton.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs.meta
rename to Assets/GameMain/Scripts/Presentation/Common/CommonButton.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta
deleted file mode 100644
index 5c106e7..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Common.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5b80dd4adb0a8e148abc7c52a2e23b42
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/About.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Common/About.meta
deleted file mode 100644
index 7ff0367..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Common/About.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 710248cee26a898459031e4336703628
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Dialog.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Dialog.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog/DialogRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Dialog/DialogRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog/DialogRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Dialog/DialogRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog/DialogRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Dialog/DialogRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Common/Dialog/DialogRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Dialog/DialogRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip.meta b/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip/ItemTooltipRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip/ItemTooltipRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip/ItemTooltipRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/ItemTooltip/ItemTooltipRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/ItemTooltip/ItemTooltipRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp.meta b/Assets/GameMain/Scripts/Runtime/UIBase/LevelUp.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/LevelUp.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpUseCase.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpUseCase.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpUseCase.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/LevelUp/LevelUpUseCase.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta
deleted file mode 100644
index f732a78..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Main.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c41ec32ecc913a3479f29daf48e3da04
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Hud.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Hud.meta
deleted file mode 100644
index 2263c74..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Hud.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a3d54de71bcad264da3c1ca92ff54e4f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Joystick.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Joystick.meta
deleted file mode 100644
index 0ab0450..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Joystick.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 337bc362617c8994fb0248fa5d5fd4a8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta
deleted file mode 100644
index 7508d05..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Menu.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f228612923ff51343a4dab06ce4c1f92
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Menu.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Menu.meta
deleted file mode 100644
index 1d627be..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Menu.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8e4010de30b33144fa20400058edfeba
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRole.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRole.meta
deleted file mode 100644
index 08785bc..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/SelectRole.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6b12df2039d69e14aa018b259f3789cf
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Setting.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Setting.meta
deleted file mode 100644
index c833997..0000000
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Menu/Setting.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 35c8961f073eae8479506bdec8b745f8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayItemRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayItemRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayItemRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayItemRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayListAreaRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayListAreaRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayListAreaRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/DisplayListAreaRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/GoodsItemRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/GoodsItemRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/GoodsItemRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/GoodsItemRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs
new file mode 100644
index 0000000..f472fc0
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs
@@ -0,0 +1,12 @@
+using SepCore.Definition;
+
+namespace SepCore.UI
+{
+    public class ShopGoodsSelection
+    {
+        public GoodsType GoodsType;
+        public int PropId;
+        public WeaponType WeaponType;
+        public int Price;
+    }
+}
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs.meta
new file mode 100644
index 0000000..e2317c3
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopGoodsSelection.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: df119fea99cc4e3e9fd080a7be4ec3ab
+timeCreated: 1789377913
\ No newline at end of file
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs
new file mode 100644
index 0000000..796d159
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs
@@ -0,0 +1,8 @@
+namespace SepCore.UI
+{
+    public sealed class ShopPurchaseResult
+    {
+        public int GoodsIndex;
+        public DisplayItemRawData DisplayItem;
+    }
+}
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs.meta
new file mode 100644
index 0000000..c6e4c74
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopPurchaseResult.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3a48aa67c1024d86b79cf1f5550084a0
+timeCreated: 1789377892
\ No newline at end of file
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRawData.cs
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRawData.cs
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRawData.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRawData.cs.meta
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs
new file mode 100644
index 0000000..6131072
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace SepCore.UI
+{
+    public sealed class ShopRefreshResult
+    {
+        public List<GoodsItemRawData> GoodsItems;
+        public int RefreshPrice;
+    }
+}
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs.meta
new file mode 100644
index 0000000..164658a
--- /dev/null
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopRefreshResult.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0870748189e94cfa8eec2645bec5fd39
+timeCreated: 1789377879
\ No newline at end of file
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs
similarity index 95%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs
index 76eb260..f3bb3b6 100644
--- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs
+++ b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Cysharp.Threading.Tasks;
 using SepCore.Definition;
 using SepCore.Entity;
@@ -11,18 +10,6 @@ using Random = UnityEngine.Random;
 
 namespace SepCore.UI
 {
-    public sealed class ShopRefreshResult
-    {
-        public List<GoodsItemRawData> GoodsItems;
-        public int RefreshPrice;
-    }
-
-    public sealed class ShopPurchaseResult
-    {
-        public int GoodsIndex;
-        public DisplayItemRawData DisplayItem;
-    }
-
     public class ShopUseCase : IUIUseCase
     {
         private readonly Player _player;
@@ -37,14 +24,6 @@ namespace SepCore.UI
         private readonly List<ShopGoodsSelection> _selections = new();
         private int _refreshTime;
 
-        private sealed class ShopGoodsSelection
-        {
-            public GoodsType GoodsType;
-            public int PropId;
-            public WeaponType WeaponType;
-            public int Price;
-        }
-
         public ShopUseCase(Player player, int currentLevel, Action onShopFinish)
         {
             _player = player;
diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs.meta
similarity index 100%
rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs.meta
rename to Assets/GameMain/Scripts/Runtime/UIBase/Shop/ShopUseCase.cs.meta