diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs
similarity index 99%
rename from Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs
rename to Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs
index 524d9f2..7963956 100644
--- a/Source/GrasscutterTools/FormGachaBannerEditor.Designer.cs
+++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     partial class FormGachaBannerEditor
     {
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
similarity index 99%
rename from Source/GrasscutterTools/FormGachaBannerEditor.cs
rename to Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
index d833a4b..c12c6d1 100644
--- a/Source/GrasscutterTools/FormGachaBannerEditor.cs
+++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
@@ -29,7 +29,7 @@ using GrasscutterTools.Properties;
 
 using Newtonsoft.Json;
 
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     /// <summary>
     /// 卡池编辑器
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.en-us.resx
similarity index 100%
rename from Source/GrasscutterTools/FormGachaBannerEditor.en-us.resx
rename to Source/GrasscutterTools/Forms/FormGachaBannerEditor.en-us.resx
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.resx
similarity index 100%
rename from Source/GrasscutterTools/FormGachaBannerEditor.resx
rename to Source/GrasscutterTools/Forms/FormGachaBannerEditor.resx
diff --git a/Source/GrasscutterTools/FormGachaBannerEditor.ru-ru.resx b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.ru-ru.resx
similarity index 100%
rename from Source/GrasscutterTools/FormGachaBannerEditor.ru-ru.resx
rename to Source/GrasscutterTools/Forms/FormGachaBannerEditor.ru-ru.resx
diff --git a/Source/GrasscutterTools/FormMain.Designer.cs b/Source/GrasscutterTools/Forms/FormMain.Designer.cs
similarity index 99%
rename from Source/GrasscutterTools/FormMain.Designer.cs
rename to Source/GrasscutterTools/Forms/FormMain.Designer.cs
index 9dd9c86..c8588c9 100644
--- a/Source/GrasscutterTools/FormMain.Designer.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     partial class FormMain
     {
diff --git a/Source/GrasscutterTools/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs
similarity index 99%
rename from Source/GrasscutterTools/FormMain.cs
rename to Source/GrasscutterTools/Forms/FormMain.cs
index cea7d08..dbc8821 100644
--- a/Source/GrasscutterTools/FormMain.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.cs
@@ -30,7 +30,7 @@ using GrasscutterTools.Game;
 using GrasscutterTools.OpenCommand;
 using GrasscutterTools.Properties;
 
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     public partial class FormMain : Form
     {
diff --git a/Source/GrasscutterTools/FormMain.en-us.resx b/Source/GrasscutterTools/Forms/FormMain.en-us.resx
similarity index 100%
rename from Source/GrasscutterTools/FormMain.en-us.resx
rename to Source/GrasscutterTools/Forms/FormMain.en-us.resx
diff --git a/Source/GrasscutterTools/FormMain.resx b/Source/GrasscutterTools/Forms/FormMain.resx
similarity index 100%
rename from Source/GrasscutterTools/FormMain.resx
rename to Source/GrasscutterTools/Forms/FormMain.resx
diff --git a/Source/GrasscutterTools/FormMain.ru-ru.resx b/Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
similarity index 100%
rename from Source/GrasscutterTools/FormMain.ru-ru.resx
rename to Source/GrasscutterTools/Forms/FormMain.ru-ru.resx
diff --git a/Source/GrasscutterTools/FormTextMapBrowser.Designer.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs
similarity index 99%
rename from Source/GrasscutterTools/FormTextMapBrowser.Designer.cs
rename to Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs
index 7e8cecf..74fdc9a 100644
--- a/Source/GrasscutterTools/FormTextMapBrowser.Designer.cs
+++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.Designer.cs
@@ -1,4 +1,4 @@
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     partial class FormTextMapBrowser
     {
diff --git a/Source/GrasscutterTools/FormTextMapBrowser.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
similarity index 99%
rename from Source/GrasscutterTools/FormTextMapBrowser.cs
rename to Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
index 3d38e31..965449e 100644
--- a/Source/GrasscutterTools/FormTextMapBrowser.cs
+++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
@@ -26,7 +26,7 @@ using System.Windows.Forms;
 using GrasscutterTools.Game;
 using GrasscutterTools.Properties;
 
-namespace GrasscutterTools
+namespace GrasscutterTools.Forms
 {
     public partial class FormTextMapBrowser : Form
     {
diff --git a/Source/GrasscutterTools/FormTextMapBrowser.en-US.resx b/Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx
similarity index 100%
rename from Source/GrasscutterTools/FormTextMapBrowser.en-US.resx
rename to Source/GrasscutterTools/Forms/FormTextMapBrowser.en-US.resx
diff --git a/Source/GrasscutterTools/FormTextMapBrowser.resx b/Source/GrasscutterTools/Forms/FormTextMapBrowser.resx
similarity index 100%
rename from Source/GrasscutterTools/FormTextMapBrowser.resx
rename to Source/GrasscutterTools/Forms/FormTextMapBrowser.resx
diff --git a/Source/GrasscutterTools/FormTextMapBrowser.ru-ru.resx b/Source/GrasscutterTools/Forms/FormTextMapBrowser.ru-ru.resx
similarity index 100%
rename from Source/GrasscutterTools/FormTextMapBrowser.ru-ru.resx
rename to Source/GrasscutterTools/Forms/FormTextMapBrowser.ru-ru.resx
diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
index 216c521..89a3453 100644
--- a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
+++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
@@ -24,8 +24,7 @@ using Newtonsoft.Json.Converters;
 namespace GrasscutterTools.Game.Gacha
 {
     /// <summary>
-    /// 使用这个只需替换掉你原来的的data/banner.json文件，
-    /// 然后重启服务器和客户端，即可享受全卡池抽卡，卡池的选择方式是点击左右箭头进行切换
+    /// https://github.com/Grasscutters/Grasscutter/pull/639
     /// </summary>
     public class GachaBanner2
     {
diff --git a/Source/GrasscutterTools/GrasscutterTools.csproj b/Source/GrasscutterTools/GrasscutterTools.csproj
index d16e24a..c9eb898 100644
--- a/Source/GrasscutterTools/GrasscutterTools.csproj
+++ b/Source/GrasscutterTools/GrasscutterTools.csproj
@@ -197,22 +197,22 @@
   <ItemGroup>
     <Compile Include="DispatchServer\DispatchServerAPI.cs" />
     <Compile Include="DispatchServer\Model\ServerStatus.cs" />
-    <Compile Include="FormGachaBannerEditor.cs">
+    <Compile Include="Forms\FormGachaBannerEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormGachaBannerEditor.Designer.cs">
+    <Compile Include="Forms\FormGachaBannerEditor.Designer.cs">
       <DependentUpon>FormGachaBannerEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormMain.cs">
+    <Compile Include="Forms\FormMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormMain.Designer.cs">
+    <Compile Include="Forms\FormMain.Designer.cs">
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormTextMapBrowser.cs">
+    <Compile Include="Forms\FormTextMapBrowser.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormTextMapBrowser.Designer.cs">
+    <Compile Include="Forms\FormTextMapBrowser.Designer.cs">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
     </Compile>
     <Compile Include="Game\Gacha\GachaBanner2.cs" />
@@ -229,34 +229,34 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils\HttpHelper.cs" />
-    <EmbeddedResource Include="FormGachaBannerEditor.en-us.resx">
+    <EmbeddedResource Include="Forms\FormGachaBannerEditor.en-us.resx">
       <DependentUpon>FormGachaBannerEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormGachaBannerEditor.ru-ru.resx">
+    <EmbeddedResource Include="Forms\FormGachaBannerEditor.ru-ru.resx">
       <DependentUpon>FormGachaBannerEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormGachaBannerEditor.resx">
+    <EmbeddedResource Include="Forms\FormGachaBannerEditor.resx">
       <DependentUpon>FormGachaBannerEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormMain.en-us.resx">
+    <EmbeddedResource Include="Forms\FormMain.en-us.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormMain.ru-ru.resx">
+    <EmbeddedResource Include="Forms\FormMain.ru-ru.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormMain.resx">
+    <EmbeddedResource Include="Forms\FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormTextMapBrowser.en-US.resx">
+    <EmbeddedResource Include="Forms\FormTextMapBrowser.en-US.resx">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormTextMapBrowser.ru-ru.resx">
+    <EmbeddedResource Include="Forms\FormTextMapBrowser.ru-ru.resx">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormTextMapBrowser.resx">
+    <EmbeddedResource Include="Forms\FormTextMapBrowser.resx">
       <DependentUpon>FormTextMapBrowser.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.en-us.resx">
diff --git a/Source/GrasscutterTools/Program.cs b/Source/GrasscutterTools/Program.cs
index 9340bb5..c46d0aa 100644
--- a/Source/GrasscutterTools/Program.cs
+++ b/Source/GrasscutterTools/Program.cs
@@ -43,7 +43,7 @@ namespace GrasscutterTools
             //处理非UI线程异常
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
-            Application.Run(new FormMain());
+            Application.Run(new Forms.FormMain());
         }
 
         #region - 全局异常处理 -