diff --git a/GFramework.Core.Abstractions/Architecture/ArchitectureModuleRegistry.cs b/GFramework.Core.Abstractions/Architectures/ArchitectureModuleRegistry.cs
similarity index 81%
rename from GFramework.Core.Abstractions/Architecture/ArchitectureModuleRegistry.cs
rename to GFramework.Core.Abstractions/Architectures/ArchitectureModuleRegistry.cs
index 5779a65..cd63794 100644
--- a/GFramework.Core.Abstractions/Architecture/ArchitectureModuleRegistry.cs
+++ b/GFramework.Core.Abstractions/Architectures/ArchitectureModuleRegistry.cs
@@ -1,13 +1,13 @@
 using System.Collections.Concurrent;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     架构模块注册表 - 用于外部模块的自动注册
 /// </summary>
 public static class ArchitectureModuleRegistry
 {
-    private static readonly ConcurrentDictionary<string, Func<IServiceModule>> _factories = new();
+    private static readonly ConcurrentDictionary<string, Func<IServiceModule>> Factories = new(StringComparer.Ordinal);
 
     /// <summary>
     ///     注册模块工厂（幂等操作，相同模块名只会注册一次）
@@ -20,7 +20,7 @@ public static class ArchitectureModuleRegistry
         var moduleName = tempModule.ModuleName;
 
         // 幂等注册：相同模块名只注册一次
-        _factories.TryAdd(moduleName, factory);
+        Factories.TryAdd(moduleName, factory);
     }
 
     /// <summary>
@@ -29,7 +29,7 @@ public static class ArchitectureModuleRegistry
     /// <returns>模块实例集合</returns>
     public static IEnumerable<IServiceModule> CreateModules()
     {
-        return _factories.Values.Select(f => f());
+        return Factories.Values.Select(f => f());
     }
 
     /// <summary>
@@ -37,6 +37,6 @@ public static class ArchitectureModuleRegistry
     /// </summary>
     public static void Clear()
     {
-        _factories.Clear();
+        Factories.Clear();
     }
 }
\ No newline at end of file
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitecture.cs b/GFramework.Core.Abstractions/Architectures/IArchitecture.cs
similarity index 98%
rename from GFramework.Core.Abstractions/Architecture/IArchitecture.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitecture.cs
index 87996ca..c2ba8fd 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitecture.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitecture.cs
@@ -4,7 +4,7 @@ using GFramework.Core.Abstractions.Systems;
 using GFramework.Core.Abstractions.Utility;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     架构接口，专注于生命周期管理，包括系统、模型、工具的注册和获取
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureConfiguration.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureConfiguration.cs
similarity index 91%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureConfiguration.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureConfiguration.cs
index b9a3001..ab5ff35 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureConfiguration.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureConfiguration.cs
@@ -1,6 +1,6 @@
 using GFramework.Core.Abstractions.Properties;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     定义架构配置的接口，提供日志工厂、日志级别和架构选项的配置功能
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureContext.cs
similarity index 99%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureContext.cs
index ae817e5..3469d8d 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureContext.cs
@@ -8,7 +8,7 @@ using GFramework.Core.Abstractions.Utility;
 using Mediator;
 using ICommand = GFramework.Core.Abstractions.Command.ICommand;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     架构上下文接口，提供对系统、模型、工具类的访问以及命令、查询、事件的发送和注册功能
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureContextProvider.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureContextProvider.cs
similarity index 92%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureContextProvider.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureContextProvider.cs
index e4bc1f4..1c1a1c4 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureContextProvider.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureContextProvider.cs
@@ -1,4 +1,4 @@
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 /// 架构上下文提供者接口，用于解耦上下文获取逻辑
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureLifecycleHook.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureLifecycleHook.cs
similarity index 91%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureLifecycleHook.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureLifecycleHook.cs
index 8be8d1e..a171493 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureLifecycleHook.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureLifecycleHook.cs
@@ -1,6 +1,6 @@
 using GFramework.Core.Abstractions.Enums;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 /// 架构生命周期钩子接口，用于在架构的不同生命周期阶段执行自定义逻辑。
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureModule.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureModule.cs
similarity index 88%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureModule.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureModule.cs
index 7ca587a..fc132c3 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureModule.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureModule.cs
@@ -1,4 +1,4 @@
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     架构模块接口，继承自架构生命周期接口。
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitecturePhaseListener.cs b/GFramework.Core.Abstractions/Architectures/IArchitecturePhaseListener.cs
similarity index 91%
rename from GFramework.Core.Abstractions/Architecture/IArchitecturePhaseListener.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitecturePhaseListener.cs
index 98a644b..5a1ceaa 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitecturePhaseListener.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitecturePhaseListener.cs
@@ -1,6 +1,6 @@
 using GFramework.Core.Abstractions.Enums;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 /// 架构阶段监听器接口，用于监听和响应架构生命周期中的不同阶段变化。
diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureServices.cs b/GFramework.Core.Abstractions/Architectures/IArchitectureServices.cs
similarity index 96%
rename from GFramework.Core.Abstractions/Architecture/IArchitectureServices.cs
rename to GFramework.Core.Abstractions/Architectures/IArchitectureServices.cs
index df36e09..83030dc 100644
--- a/GFramework.Core.Abstractions/Architecture/IArchitectureServices.cs
+++ b/GFramework.Core.Abstractions/Architectures/IArchitectureServices.cs
@@ -4,7 +4,7 @@ using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Abstractions.Query;
 using GFramework.Core.Abstractions.Rule;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     架构服务接口，定义了框架核心架构所需的服务组件
diff --git a/GFramework.Core.Abstractions/Architecture/IServiceModule.cs b/GFramework.Core.Abstractions/Architectures/IServiceModule.cs
similarity index 95%
rename from GFramework.Core.Abstractions/Architecture/IServiceModule.cs
rename to GFramework.Core.Abstractions/Architectures/IServiceModule.cs
index c606865..5234e65 100644
--- a/GFramework.Core.Abstractions/Architecture/IServiceModule.cs
+++ b/GFramework.Core.Abstractions/Architectures/IServiceModule.cs
@@ -1,7 +1,7 @@
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Abstractions.Lifecycle;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     服务模块接口，定义了服务模块的基本契约。
diff --git a/GFramework.Core.Abstractions/Architecture/IServiceModuleManager.cs b/GFramework.Core.Abstractions/Architectures/IServiceModuleManager.cs
similarity index 95%
rename from GFramework.Core.Abstractions/Architecture/IServiceModuleManager.cs
rename to GFramework.Core.Abstractions/Architectures/IServiceModuleManager.cs
index ed2145b..ab389a5 100644
--- a/GFramework.Core.Abstractions/Architecture/IServiceModuleManager.cs
+++ b/GFramework.Core.Abstractions/Architectures/IServiceModuleManager.cs
@@ -1,6 +1,6 @@
 using GFramework.Core.Abstractions.Ioc;
 
-namespace GFramework.Core.Abstractions.Architecture;
+namespace GFramework.Core.Abstractions.Architectures;
 
 /// <summary>
 ///     服务模块管理器接口，用于管理架构中的服务模块。
diff --git a/GFramework.Core.Abstractions/Model/IModel.cs b/GFramework.Core.Abstractions/Model/IModel.cs
index a0985ce..79a27f5 100644
--- a/GFramework.Core.Abstractions/Model/IModel.cs
+++ b/GFramework.Core.Abstractions/Model/IModel.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Rule;
 
diff --git a/GFramework.Core.Abstractions/Rule/IContextAware.cs b/GFramework.Core.Abstractions/Rule/IContextAware.cs
index 449ebbc..cd5b6e3 100644
--- a/GFramework.Core.Abstractions/Rule/IContextAware.cs
+++ b/GFramework.Core.Abstractions/Rule/IContextAware.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Core.Abstractions.Rule;
 
diff --git a/GFramework.Core.Abstractions/Systems/ISystem.cs b/GFramework.Core.Abstractions/Systems/ISystem.cs
index 22699b7..6036744 100644
--- a/GFramework.Core.Abstractions/Systems/ISystem.cs
+++ b/GFramework.Core.Abstractions/Systems/ISystem.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Rule;
 
diff --git a/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
index 2750fcc..dc5fec8 100644
--- a/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Logging;
 using GFramework.Core.Abstractions.Properties;
 using GFramework.Core.Architectures;
diff --git a/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
index ee4af3e..00684cb 100644
--- a/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Environment;
diff --git a/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
index 56b08f0..9324429 100644
--- a/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Events;
diff --git a/GFramework.Core.Tests/Architectures/ContextProviderTests.cs b/GFramework.Core.Tests/Architectures/ContextProviderTests.cs
index 2e5ad0c..5fc205c 100644
--- a/GFramework.Core.Tests/Architectures/ContextProviderTests.cs
+++ b/GFramework.Core.Tests/Architectures/ContextProviderTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Architectures;
 
 namespace GFramework.Core.Tests.Architectures;
diff --git a/GFramework.Core.Tests/Architectures/GameContextTests.cs b/GFramework.Core.Tests/Architectures/GameContextTests.cs
index b5ff02f..8f1bea5 100644
--- a/GFramework.Core.Tests/Architectures/GameContextTests.cs
+++ b/GFramework.Core.Tests/Architectures/GameContextTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Events;
diff --git a/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
index 6c13900..4e51719 100644
--- a/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
+++ b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Model;
diff --git a/GFramework.Core.Tests/Coroutine/CommandCoroutineExtensionsTests.cs b/GFramework.Core.Tests/Coroutine/CommandCoroutineExtensionsTests.cs
index ad7434d..c6b100b 100644
--- a/GFramework.Core.Tests/Coroutine/CommandCoroutineExtensionsTests.cs
+++ b/GFramework.Core.Tests/Coroutine/CommandCoroutineExtensionsTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Coroutine;
 using GFramework.Core.Abstractions.Events;
@@ -6,7 +6,6 @@ using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Coroutine.Extensions;
 using GFramework.Core.Coroutine.Instructions;
 using Moq;
-using NUnit.Framework;
 
 namespace GFramework.Core.Tests.Coroutine;
 
diff --git a/GFramework.Core.Tests/Coroutine/MediatorCoroutineExtensionsTests.cs b/GFramework.Core.Tests/Coroutine/MediatorCoroutineExtensionsTests.cs
index 649836b..eeb1493 100644
--- a/GFramework.Core.Tests/Coroutine/MediatorCoroutineExtensionsTests.cs
+++ b/GFramework.Core.Tests/Coroutine/MediatorCoroutineExtensionsTests.cs
@@ -11,13 +11,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Coroutine;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Coroutine.Extensions;
 using Mediator;
 using Moq;
-using NUnit.Framework;
 
 namespace GFramework.Core.Tests.Coroutine;
 
diff --git a/GFramework.Core.Tests/Coroutine/QueryCoroutineExtensionsTests.cs b/GFramework.Core.Tests/Coroutine/QueryCoroutineExtensionsTests.cs
index 995f057..7e38dfd 100644
--- a/GFramework.Core.Tests/Coroutine/QueryCoroutineExtensionsTests.cs
+++ b/GFramework.Core.Tests/Coroutine/QueryCoroutineExtensionsTests.cs
@@ -1,10 +1,9 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Coroutine;
 using GFramework.Core.Abstractions.Query;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Coroutine.Extensions;
 using Moq;
-using NUnit.Framework;
 
 namespace GFramework.Core.Tests.Coroutine;
 
diff --git a/GFramework.Core.Tests/Mediator/MediatorArchitectureIntegrationTests.cs b/GFramework.Core.Tests/Mediator/MediatorArchitectureIntegrationTests.cs
index 6c67a72..85bbf3a 100644
--- a/GFramework.Core.Tests/Mediator/MediatorArchitectureIntegrationTests.cs
+++ b/GFramework.Core.Tests/Mediator/MediatorArchitectureIntegrationTests.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using System.Reflection;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Architectures;
 using GFramework.Core.Command;
 using GFramework.Core.Ioc;
diff --git a/GFramework.Core.Tests/Mediator/MediatorComprehensiveTests.cs b/GFramework.Core.Tests/Mediator/MediatorComprehensiveTests.cs
index daee8e9..020bc26 100644
--- a/GFramework.Core.Tests/Mediator/MediatorComprehensiveTests.cs
+++ b/GFramework.Core.Tests/Mediator/MediatorComprehensiveTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Events;
 using GFramework.Core.Architectures;
 using GFramework.Core.Command;
diff --git a/GFramework.Core.Tests/Model/FailingModel.cs b/GFramework.Core.Tests/Model/FailingModel.cs
index a60c10b..5f69208 100644
--- a/GFramework.Core.Tests/Model/FailingModel.cs
+++ b/GFramework.Core.Tests/Model/FailingModel.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Model;
 
diff --git a/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs b/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs
index d789bf4..0a95d13 100644
--- a/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs
+++ b/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Model;
 using GFramework.Core.Abstractions.Rule;
diff --git a/GFramework.Core.Tests/Rule/ContextAwareTests.cs b/GFramework.Core.Tests/Rule/ContextAwareTests.cs
index 03d38fe..7c65931 100644
--- a/GFramework.Core.Tests/Rule/ContextAwareTests.cs
+++ b/GFramework.Core.Tests/Rule/ContextAwareTests.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Architectures;
 using GFramework.Core.Rule;
diff --git a/GFramework.Core.Tests/Systems/AsyncTestSystem.cs b/GFramework.Core.Tests/Systems/AsyncTestSystem.cs
index 8c339a9..2b715bc 100644
--- a/GFramework.Core.Tests/Systems/AsyncTestSystem.cs
+++ b/GFramework.Core.Tests/Systems/AsyncTestSystem.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Systems;
diff --git a/GFramework.Core.Tests/Systems/TestSystem.cs b/GFramework.Core.Tests/Systems/TestSystem.cs
index 9fe6989..98d5580 100644
--- a/GFramework.Core.Tests/Systems/TestSystem.cs
+++ b/GFramework.Core.Tests/Systems/TestSystem.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Systems;
 
diff --git a/GFramework.Core/Architectures/Architecture.cs b/GFramework.Core/Architectures/Architecture.cs
index a20685d..3bf2a98 100644
--- a/GFramework.Core/Architectures/Architecture.cs
+++ b/GFramework.Core/Architectures/Architecture.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Ioc;
diff --git a/GFramework.Core/Architectures/ArchitectureConfiguration.cs b/GFramework.Core/Architectures/ArchitectureConfiguration.cs
index 679b0a3..e95017c 100644
--- a/GFramework.Core/Architectures/ArchitectureConfiguration.cs
+++ b/GFramework.Core/Architectures/ArchitectureConfiguration.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Logging;
 using GFramework.Core.Abstractions.Properties;
 using GFramework.Core.Logging;
diff --git a/GFramework.Core/Architectures/ArchitectureContext.cs b/GFramework.Core/Architectures/ArchitectureContext.cs
index e18dc06..1e3d72a 100644
--- a/GFramework.Core/Architectures/ArchitectureContext.cs
+++ b/GFramework.Core/Architectures/ArchitectureContext.cs
@@ -1,5 +1,5 @@
 using System.Collections.Concurrent;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Events;
diff --git a/GFramework.Core/Architectures/ArchitectureServices.cs b/GFramework.Core/Architectures/ArchitectureServices.cs
index 04a1505..27d8dbf 100644
--- a/GFramework.Core/Architectures/ArchitectureServices.cs
+++ b/GFramework.Core/Architectures/ArchitectureServices.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
 using GFramework.Core.Abstractions.Events;
 using GFramework.Core.Abstractions.Ioc;
diff --git a/GFramework.Core/Architectures/GameContext.cs b/GFramework.Core/Architectures/GameContext.cs
index ea16bc9..aa4f84b 100644
--- a/GFramework.Core/Architectures/GameContext.cs
+++ b/GFramework.Core/Architectures/GameContext.cs
@@ -1,5 +1,5 @@
 using System.Collections.Concurrent;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Core.Architectures;
 
diff --git a/GFramework.Core/Architectures/GameContextProvider.cs b/GFramework.Core/Architectures/GameContextProvider.cs
index 6bc1994..7c14662 100644
--- a/GFramework.Core/Architectures/GameContextProvider.cs
+++ b/GFramework.Core/Architectures/GameContextProvider.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Core.Architectures;
 
diff --git a/GFramework.Core/Architectures/RegistryInitializationHookBase.cs b/GFramework.Core/Architectures/RegistryInitializationHookBase.cs
index 66a6e96..fe746db 100644
--- a/GFramework.Core/Architectures/RegistryInitializationHookBase.cs
+++ b/GFramework.Core/Architectures/RegistryInitializationHookBase.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Utility;
 
diff --git a/GFramework.Core/Architectures/ScopedContextProvider.cs b/GFramework.Core/Architectures/ScopedContextProvider.cs
index f8c7a14..0ad08e7 100644
--- a/GFramework.Core/Architectures/ScopedContextProvider.cs
+++ b/GFramework.Core/Architectures/ScopedContextProvider.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Core.Architectures;
 
diff --git a/GFramework.Core/Rule/ContextAwareBase.cs b/GFramework.Core/Rule/ContextAwareBase.cs
index c0293ec..173c4ee 100644
--- a/GFramework.Core/Rule/ContextAwareBase.cs
+++ b/GFramework.Core/Rule/ContextAwareBase.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Architectures;
 
diff --git a/GFramework.Core/Services/Modules/AsyncQueryExecutorModule.cs b/GFramework.Core/Services/Modules/AsyncQueryExecutorModule.cs
index a29aade..46b3264 100644
--- a/GFramework.Core/Services/Modules/AsyncQueryExecutorModule.cs
+++ b/GFramework.Core/Services/Modules/AsyncQueryExecutorModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Query;
 
diff --git a/GFramework.Core/Services/Modules/CommandExecutorModule.cs b/GFramework.Core/Services/Modules/CommandExecutorModule.cs
index f94f4d5..2c69a38 100644
--- a/GFramework.Core/Services/Modules/CommandExecutorModule.cs
+++ b/GFramework.Core/Services/Modules/CommandExecutorModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Command;
 
diff --git a/GFramework.Core/Services/Modules/EventBusModule.cs b/GFramework.Core/Services/Modules/EventBusModule.cs
index 32065ba..e62e064 100644
--- a/GFramework.Core/Services/Modules/EventBusModule.cs
+++ b/GFramework.Core/Services/Modules/EventBusModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Events;
 
diff --git a/GFramework.Core/Services/Modules/QueryExecutorModule.cs b/GFramework.Core/Services/Modules/QueryExecutorModule.cs
index 5df23bc..0d109c3 100644
--- a/GFramework.Core/Services/Modules/QueryExecutorModule.cs
+++ b/GFramework.Core/Services/Modules/QueryExecutorModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Query;
 
diff --git a/GFramework.Core/Services/ServiceModuleManager.cs b/GFramework.Core/Services/ServiceModuleManager.cs
index 1bb07cf..d07c128 100644
--- a/GFramework.Core/Services/ServiceModuleManager.cs
+++ b/GFramework.Core/Services/ServiceModuleManager.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Logging;
diff --git a/GFramework.Core/State/AsyncContextAwareStateBase.cs b/GFramework.Core/State/AsyncContextAwareStateBase.cs
index 2c332da..1695b87 100644
--- a/GFramework.Core/State/AsyncContextAwareStateBase.cs
+++ b/GFramework.Core/State/AsyncContextAwareStateBase.cs
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Abstractions.State;
diff --git a/GFramework.Core/State/ContextAwareStateBase.cs b/GFramework.Core/State/ContextAwareStateBase.cs
index 5175d50..0eda262 100644
--- a/GFramework.Core/State/ContextAwareStateBase.cs
+++ b/GFramework.Core/State/ContextAwareStateBase.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Abstractions.State;
diff --git a/GFramework.Core/State/StateMachineSystem.cs b/GFramework.Core/State/StateMachineSystem.cs
index 58b5b79..773a13a 100644
--- a/GFramework.Core/State/StateMachineSystem.cs
+++ b/GFramework.Core/State/StateMachineSystem.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Lifecycle;
 using GFramework.Core.Abstractions.Rule;
diff --git a/GFramework.Ecs.Arch.Abstractions/IArchEcsModule.cs b/GFramework.Ecs.Arch.Abstractions/IArchEcsModule.cs
index 078572d..4babc6a 100644
--- a/GFramework.Ecs.Arch.Abstractions/IArchEcsModule.cs
+++ b/GFramework.Ecs.Arch.Abstractions/IArchEcsModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Ecs.Arch.Abstractions;
 
diff --git a/GFramework.Ecs.Arch.Tests/Integration/ExplicitRegistrationTests.cs b/GFramework.Ecs.Arch.Tests/Integration/ExplicitRegistrationTests.cs
index dc27db2..7b86492 100644
--- a/GFramework.Ecs.Arch.Tests/Integration/ExplicitRegistrationTests.cs
+++ b/GFramework.Ecs.Arch.Tests/Integration/ExplicitRegistrationTests.cs
@@ -1,5 +1,5 @@
 using Arch.Core;
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Architectures;
 using GFramework.Core.Ioc;
 using GFramework.Ecs.Arch.Abstractions;
diff --git a/GFramework.Ecs.Arch/Extensions/ArchExtensions.cs b/GFramework.Ecs.Arch/Extensions/ArchExtensions.cs
index 9ac01f8..1f2a589 100644
--- a/GFramework.Ecs.Arch/Extensions/ArchExtensions.cs
+++ b/GFramework.Ecs.Arch/Extensions/ArchExtensions.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 
 namespace GFramework.Ecs.Arch.Extensions;
 
diff --git a/GFramework.Godot/Architecture/AbstractArchitecture.cs b/GFramework.Godot/Architecture/AbstractArchitecture.cs
index 537cfc0..a82f001 100644
--- a/GFramework.Godot/Architecture/AbstractArchitecture.cs
+++ b/GFramework.Godot/Architecture/AbstractArchitecture.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Constants;
 using GFramework.Godot.Extensions;
diff --git a/GFramework.Godot/Architecture/AbstractGodotModule.cs b/GFramework.Godot/Architecture/AbstractGodotModule.cs
index 2eaa6dc..289f05d 100644
--- a/GFramework.Godot/Architecture/AbstractGodotModule.cs
+++ b/GFramework.Godot/Architecture/AbstractGodotModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Enums;
 using Godot;
 
diff --git a/GFramework.Godot/Architecture/IGodotModule.cs b/GFramework.Godot/Architecture/IGodotModule.cs
index 9eae792..6f217aa 100644
--- a/GFramework.Godot/Architecture/IGodotModule.cs
+++ b/GFramework.Godot/Architecture/IGodotModule.cs
@@ -1,4 +1,4 @@
-using GFramework.Core.Abstractions.Architecture;
+using GFramework.Core.Abstractions.Architectures;
 using Godot;
 
 namespace GFramework.Godot.Architecture;
diff --git a/GFramework.SourceGenerators.Tests/Rule/ContextAwareGeneratorSnapshotTests.cs b/GFramework.SourceGenerators.Tests/Rule/ContextAwareGeneratorSnapshotTests.cs
index 3340cbb..dba9faa 100644
--- a/GFramework.SourceGenerators.Tests/Rule/ContextAwareGeneratorSnapshotTests.cs
+++ b/GFramework.SourceGenerators.Tests/Rule/ContextAwareGeneratorSnapshotTests.cs
@@ -35,13 +35,13 @@ public class ContextAwareGeneratorSnapshotTests
                                   public interface IContextAware
                                   {
                                       void SetContext(
-                                          GFramework.Core.Abstractions.Architecture.IArchitectureContext context);
+                                          GFramework.Core.Abstractions.Architectures.IArchitectureContext context);
 
-                                      GFramework.Core.Abstractions.Architecture.IArchitectureContext GetContext();
+                                      GFramework.Core.Abstractions.Architectures.IArchitectureContext GetContext();
                                   }
                               }
 
-                              namespace GFramework.Core.Abstractions.Architecture
+                              namespace GFramework.Core.Abstractions.Architectures
                               {
                                   public interface IArchitectureContext { }
 
@@ -52,9 +52,9 @@ public class ContextAwareGeneratorSnapshotTests
                                   }
                               }
 
-                              namespace GFramework.Core.Architecture
+                              namespace GFramework.Core.Architectures
                               {
-                                  using GFramework.Core.Abstractions.Architecture;
+                                  using GFramework.Core.Abstractions.Architectures;
 
                                   public sealed class GameContextProvider : IArchitectureContextProvider
                                   {
diff --git a/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs b/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs
index 1d0853d..bd48ab3 100644
--- a/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs
+++ b/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs
@@ -129,21 +129,21 @@ public sealed class ContextAwareGenerator : MetadataAttributeClassGeneratorBase
     /// <param name="sb">字符串构建器</param>
     private static void GenerateContextProperty(StringBuilder sb)
     {
-        sb.AppendLine("    private global::GFramework.Core.Abstractions.Architecture.IArchitectureContext? _context;");
+        sb.AppendLine("    private global::GFramework.Core.Abstractions.Architectures.IArchitectureContext? _context;");
         sb.AppendLine(
-            "    private static global::GFramework.Core.Abstractions.Architecture.IArchitectureContextProvider? _contextProvider;");
+            "    private static global::GFramework.Core.Abstractions.Architectures.IArchitectureContextProvider? _contextProvider;");
         sb.AppendLine();
         sb.AppendLine("    /// <summary>");
         sb.AppendLine("    /// 自动获取的架构上下文（懒加载，默认使用 GameContextProvider）");
         sb.AppendLine("    /// </summary>");
-        sb.AppendLine("    protected global::GFramework.Core.Abstractions.Architecture.IArchitectureContext Context");
+        sb.AppendLine("    protected global::GFramework.Core.Abstractions.Architectures.IArchitectureContext Context");
         sb.AppendLine("    {");
         sb.AppendLine("        get");
         sb.AppendLine("        {");
         sb.AppendLine("            if (_context == null)");
         sb.AppendLine("            {");
         sb.AppendLine(
-            "                _contextProvider ??= new global::GFramework.Core.Architecture.GameContextProvider();");
+            "                _contextProvider ??= new global::GFramework.Core.Architectures.GameContextProvider();");
         sb.AppendLine("                _context = _contextProvider.GetContext();");
         sb.AppendLine("            }");
         sb.AppendLine();
@@ -156,7 +156,7 @@ public sealed class ContextAwareGenerator : MetadataAttributeClassGeneratorBase
         sb.AppendLine("    /// </summary>");
         sb.AppendLine("    /// <param name=\"provider\">上下文提供者实例</param>");
         sb.AppendLine(
-            "    public static void SetContextProvider(global::GFramework.Core.Abstractions.Architecture.IArchitectureContextProvider provider)");
+            "    public static void SetContextProvider(global::GFramework.Core.Abstractions.Architectures.IArchitectureContextProvider provider)");
         sb.AppendLine("    {");
         sb.AppendLine("        _contextProvider = provider;");
         sb.AppendLine("    }");