diff --git a/Common.BasicHelper.Test/Core.Shell.CommandsExecutor.cs b/Common.BasicHelper.Test/Core/Shell/Test_CommandsExecutor.cs
similarity index 55%
rename from Common.BasicHelper.Test/Core.Shell.CommandsExecutor.cs
rename to Common.BasicHelper.Test/Core/Shell/Test_CommandsExecutor.cs
index ca5b737..cb209bc 100644
--- a/Common.BasicHelper.Test/Core.Shell.CommandsExecutor.cs
+++ b/Common.BasicHelper.Test/Core/Shell/Test_CommandsExecutor.cs
@@ -1,12 +1,12 @@
 using Common.BasicHelper.Core.Shell;
 
-namespace Common.BasicHelper.Test;
+namespace Common.BasicHelper.Test.Core.Shell;
 
 [TestClass]
-public class CommadsExecutor_Test
+public class Test_CommandsExecutor
 {
     [TestMethod]
-    public void TestCommand()
+    public void Test_Command()
     {
         Console.WriteLine("help".ExecuteAsCommand());
     }
diff --git a/Common.BasicHelper.Test/Core/Shell/Test_EnvironmentHelper.cs b/Common.BasicHelper.Test/Core/Shell/Test_EnvironmentHelper.cs
new file mode 100644
index 0000000..ffe1e69
--- /dev/null
+++ b/Common.BasicHelper.Test/Core/Shell/Test_EnvironmentHelper.cs
@@ -0,0 +1,5 @@
+namespace Common.BasicHelper.Test.Core.Shell;
+
+internal class Test_EnvironmentHelper
+{
+}
diff --git a/Common.BasicHelper.Test/EnvironmentHelperEnvironmentHelper_Test.cs b/Common.BasicHelper.Test/EnvironmentHelperEnvironmentHelper_Test.cs
deleted file mode 100644
index 1986d0e..0000000
--- a/Common.BasicHelper.Test/EnvironmentHelperEnvironmentHelper_Test.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Common.BasicHelper.Test.Core.Shell
-{
-    internal class EnvironmentHelperEnvironmentHelper_Test
-    {
-    }
-}
diff --git a/Common.BasicHelper.Test/UI.Screen.cs b/Common.BasicHelper.Test/Graphics/Screen/Test_Resolution.cs
similarity index 65%
rename from Common.BasicHelper.Test/UI.Screen.cs
rename to Common.BasicHelper.Test/Graphics/Screen/Test_Resolution.cs
index 82439dd..d1b83c8 100644
--- a/Common.BasicHelper.Test/UI.Screen.cs
+++ b/Common.BasicHelper.Test/Graphics/Screen/Test_Resolution.cs
@@ -1,12 +1,12 @@
-using Common.BasicHelper.UI.Screen;
+using Common.BasicHelper.Graphics.Screen;
 
-namespace Common.BasicHelper.Test;
+namespace Common.BasicHelper.Test.Graphics.Screen;
 
 [TestClass]
-public class UI_Test
+public class Test_Resolution
 {
     [TestMethod]
-    public void ResolutionSuggestTest()
+    public void Test_SuggestResolution()
     {
         foreach (var item in Resolution.resolutions)
         {
@@ -15,4 +15,4 @@ public void ResolutionSuggestTest()
             Console.WriteLine($"{item}\r\n\t{tarRes}");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Common.BasicHelper.Test/Util.Extension.cs b/Common.BasicHelper.Test/Utils/Extensions/Test_QueueHelper.cs
similarity index 77%
rename from Common.BasicHelper.Test/Util.Extension.cs
rename to Common.BasicHelper.Test/Utils/Extensions/Test_QueueHelper.cs
index 984cd7d..2cbd5cd 100644
--- a/Common.BasicHelper.Test/Util.Extension.cs
+++ b/Common.BasicHelper.Test/Utils/Extensions/Test_QueueHelper.cs
@@ -1,12 +1,12 @@
-using Common.BasicHelper.Util.Extension;
+using Common.BasicHelper.Utils.Extensions;
 
-namespace Common.BasicHelper.Test;
+namespace Common.BasicHelper.Test.Utils.Extensions;
 
 [TestClass]
-public class Util_Extension_Test
+public class Test_QueueHelper
 {
     [TestMethod]
-    public void QueueExtensionTest()
+    public void Test_QueueExtensions()
     {
         var queue = new Queue<int>()
             .Push(1)
@@ -26,7 +26,7 @@ public void QueueExtensionTest()
     }
 
     [TestMethod]
-    public void DumpQueueTest()
+    public void Test_DumpQueue()
     {
         var queue = new Queue<int>()
             .Push(1)
diff --git a/Common.BasicHelper.Test/Util.cs b/Common.BasicHelper.Test/Utils/Test_GUID.cs
similarity index 52%
rename from Common.BasicHelper.Test/Util.cs
rename to Common.BasicHelper.Test/Utils/Test_GUID.cs
index 738a216..d984328 100644
--- a/Common.BasicHelper.Test/Util.cs
+++ b/Common.BasicHelper.Test/Utils/Test_GUID.cs
@@ -1,12 +1,12 @@
-using Common.BasicHelper.Util;
+using Common.BasicHelper.Utils;
 
-namespace Common.BasicHelper.Test;
+namespace Common.BasicHelper.Test.Utils;
 
 [TestClass]
-public class Util_Test
+public class Test_GUID
 {
     [TestMethod]
-    public void GUID_Part_Random_Generate_Test()
+    public void Test_GenerateRandomGUIDPart()
     {
         for (int i = 0; i < 10; i++)
             Console.WriteLine(GUID_Helper.Random_GUID_Generate().GetString());
diff --git a/Common.BasicHelper/UI/Screen/Resolution.cs b/Common.BasicHelper/Graphics/Screen/Resolution.cs
similarity index 99%
rename from Common.BasicHelper/UI/Screen/Resolution.cs
rename to Common.BasicHelper/Graphics/Screen/Resolution.cs
index 3ca0227..1fbd63b 100644
--- a/Common.BasicHelper/UI/Screen/Resolution.cs
+++ b/Common.BasicHelper/Graphics/Screen/Resolution.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Common.BasicHelper.UI.Screen;
+namespace Common.BasicHelper.Graphics.Screen;
 
 public class Resolution
 {
diff --git a/Common.BasicHelper/IO/FileHelper.cs b/Common.BasicHelper/IO/FileHelper.cs
index 74767d8..a12e5df 100644
--- a/Common.BasicHelper/IO/FileHelper.cs
+++ b/Common.BasicHelper/IO/FileHelper.cs
@@ -1,5 +1,5 @@
-using Common.BasicHelper.Util;
-using Common.BasicHelper.Util.Extension;
+using Common.BasicHelper.Utils;
+using Common.BasicHelper.Utils.Extensions;
 using System;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/Common.BasicHelper/Math/Tricks.cs b/Common.BasicHelper/Math/Tricks.cs
index 97e7f03..e438286 100644
--- a/Common.BasicHelper/Math/Tricks.cs
+++ b/Common.BasicHelper/Math/Tricks.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
 namespace Common.BasicHelper.Math;
 
diff --git a/Common.BasicHelper/NET/BasicNet.cs b/Common.BasicHelper/NET/BasicNet.cs
index f0b09b4..79dbb2f 100644
--- a/Common.BasicHelper/NET/BasicNet.cs
+++ b/Common.BasicHelper/NET/BasicNet.cs
@@ -1,4 +1,4 @@
-using Common.BasicHelper.Util.Extension;
+using Common.BasicHelper.Utils.Extensions;
 using System;
 using System.IO;
 using System.Net;
diff --git a/Common.BasicHelper/Util/Extension/ArrayHelper.cs b/Common.BasicHelper/Util/Extension/ArrayHelper.cs
deleted file mode 100644
index a5ada98..0000000
--- a/Common.BasicHelper/Util/Extension/ArrayHelper.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Common.BasicHelper.Util.Extension;
-
-public static class ArrayHelper
-{
-
-}
diff --git a/Common.BasicHelper/Utils/Extensions/ArrayHelper.cs b/Common.BasicHelper/Utils/Extensions/ArrayHelper.cs
new file mode 100644
index 0000000..386641c
--- /dev/null
+++ b/Common.BasicHelper/Utils/Extensions/ArrayHelper.cs
@@ -0,0 +1,6 @@
+namespace Common.BasicHelper.Utils.Extensions;
+
+public static class ArrayHelper
+{
+
+}
diff --git a/Common.BasicHelper/Util/Extension/CleanHelper.cs b/Common.BasicHelper/Utils/Extensions/CleanHelper.cs
similarity index 94%
rename from Common.BasicHelper/Util/Extension/CleanHelper.cs
rename to Common.BasicHelper/Utils/Extensions/CleanHelper.cs
index c6ab8ce..1929174 100644
--- a/Common.BasicHelper/Util/Extension/CleanHelper.cs
+++ b/Common.BasicHelper/Utils/Extensions/CleanHelper.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Net;
 
-namespace Common.BasicHelper.Util.Extension;
+namespace Common.BasicHelper.Utils.Extensions;
 
 public static class CleanHelper
 {
diff --git a/Common.BasicHelper/Util/Extension/Dumpper.cs b/Common.BasicHelper/Utils/Extensions/Dumpper.cs
similarity index 99%
rename from Common.BasicHelper/Util/Extension/Dumpper.cs
rename to Common.BasicHelper/Utils/Extensions/Dumpper.cs
index 0167ef1..db4f8ee 100644
--- a/Common.BasicHelper/Util/Extension/Dumpper.cs
+++ b/Common.BasicHelper/Utils/Extensions/Dumpper.cs
@@ -2,7 +2,7 @@
 using System.Net.NetworkInformation;
 using System.Text;
 
-namespace Common.BasicHelper.Util.Extension;
+namespace Common.BasicHelper.Utils.Extensions;
 
 public static class Dumpper
 {
diff --git a/Common.BasicHelper/Util/Extension/ListHelper.cs b/Common.BasicHelper/Utils/Extensions/ListHelper.cs
similarity index 93%
rename from Common.BasicHelper/Util/Extension/ListHelper.cs
rename to Common.BasicHelper/Utils/Extensions/ListHelper.cs
index 8de7081..bbd286a 100644
--- a/Common.BasicHelper/Util/Extension/ListHelper.cs
+++ b/Common.BasicHelper/Utils/Extensions/ListHelper.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Common.BasicHelper.Util.Extension;
+namespace Common.BasicHelper.Utils.Extensions;
 
 public static class ListHelper
 {
diff --git a/Common.BasicHelper/Util/Extension/QueueHelper.cs b/Common.BasicHelper/Utils/Extensions/QueueHelper.cs
similarity index 98%
rename from Common.BasicHelper/Util/Extension/QueueHelper.cs
rename to Common.BasicHelper/Utils/Extensions/QueueHelper.cs
index d463ad0..38c3f53 100644
--- a/Common.BasicHelper/Util/Extension/QueueHelper.cs
+++ b/Common.BasicHelper/Utils/Extensions/QueueHelper.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Common.BasicHelper.Util.Extension;
+namespace Common.BasicHelper.Utils.Extensions;
 
 public static class QueueHelper
 {
diff --git a/Common.BasicHelper/Util/Extension/StringHelper.cs b/Common.BasicHelper/Utils/Extensions/StringHelper.cs
similarity index 97%
rename from Common.BasicHelper/Util/Extension/StringHelper.cs
rename to Common.BasicHelper/Utils/Extensions/StringHelper.cs
index 0048732..2963b35 100644
--- a/Common.BasicHelper/Util/Extension/StringHelper.cs
+++ b/Common.BasicHelper/Utils/Extensions/StringHelper.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Common.BasicHelper.Util.Extension;
+namespace Common.BasicHelper.Utils.Extensions;
 
 public static class StringHelper
 {
diff --git a/Common.BasicHelper/Util/GUID.cs b/Common.BasicHelper/Utils/GUID.cs
similarity index 99%
rename from Common.BasicHelper/Util/GUID.cs
rename to Common.BasicHelper/Utils/GUID.cs
index 0779a35..abfe020 100644
--- a/Common.BasicHelper/Util/GUID.cs
+++ b/Common.BasicHelper/Utils/GUID.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace Common.BasicHelper.Util;
+namespace Common.BasicHelper.Utils;
 
 public static class GUID_Helper
 {
diff --git a/Common.BasicHelper/Util/Platform.cs b/Common.BasicHelper/Utils/Platform.cs
similarity index 89%
rename from Common.BasicHelper/Util/Platform.cs
rename to Common.BasicHelper/Utils/Platform.cs
index f54cb34..f212874 100644
--- a/Common.BasicHelper/Util/Platform.cs
+++ b/Common.BasicHelper/Utils/Platform.cs
@@ -1,4 +1,4 @@
-namespace Common.BasicHelper.Util;
+namespace Common.BasicHelper.Utils;
 
 public struct Platform
 {
diff --git a/Common.BasicHelper/Util/RegexStrings.cs b/Common.BasicHelper/Utils/RegexStrings.cs
similarity index 82%
rename from Common.BasicHelper/Util/RegexStrings.cs
rename to Common.BasicHelper/Utils/RegexStrings.cs
index 6223820..94cb468 100644
--- a/Common.BasicHelper/Util/RegexStrings.cs
+++ b/Common.BasicHelper/Utils/RegexStrings.cs
@@ -1,4 +1,4 @@
-namespace Common.BasicHelper.Util;
+namespace Common.BasicHelper.Utils;
 
 public struct RegexStrings
 {
diff --git a/Common.BasicHelper/Util/Result.cs b/Common.BasicHelper/Utils/Result.cs
similarity index 97%
rename from Common.BasicHelper/Util/Result.cs
rename to Common.BasicHelper/Utils/Result.cs
index f6e5aec..522a96e 100644
--- a/Common.BasicHelper/Util/Result.cs
+++ b/Common.BasicHelper/Utils/Result.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Common.BasicHelper.Util;
+namespace Common.BasicHelper.Utils;
 
 public class Result<T> : Exception
 {
diff --git a/Common.BasicHelper/Util/Version.cs b/Common.BasicHelper/Utils/Version.cs
similarity index 99%
rename from Common.BasicHelper/Util/Version.cs
rename to Common.BasicHelper/Utils/Version.cs
index 7f7bd52..5479217 100644
--- a/Common.BasicHelper/Util/Version.cs
+++ b/Common.BasicHelper/Utils/Version.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Common.BasicHelper.Util;
+namespace Common.BasicHelper.Utils;
 
 public struct Version
 {
diff --git a/Common.BasicHelper/icon.png b/Common.BasicHelper/icon.png
index ae6604d..70070aa 100644
Binary files a/Common.BasicHelper/icon.png and b/Common.BasicHelper/icon.png differ