diff --git a/GFramework.Core.Tests/Architecture/ArchitectureConfigurationTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/ArchitectureConfigurationTests.cs
rename to GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
index 07106e0..2750fcc 100644
--- a/GFramework.Core.Tests/Architecture/ArchitectureConfigurationTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureConfigurationTests.cs
@@ -4,7 +4,7 @@ using GFramework.Core.Abstractions.Properties;
 using GFramework.Core.Architectures;
 using GFramework.Core.Logging;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     ArchitectureConfiguration类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/ArchitectureConstantsTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureConstantsTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/ArchitectureConstantsTests.cs
rename to GFramework.Core.Tests/Architectures/ArchitectureConstantsTests.cs
index d4b8613..1b7514f 100644
--- a/GFramework.Core.Tests/Architecture/ArchitectureConstantsTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureConstantsTests.cs
@@ -2,7 +2,7 @@ using System.Collections.Immutable;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Architectures;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     ArchitectureConstants类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs
rename to GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
index 4542e5d..a3c2411 100644
--- a/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs
@@ -15,7 +15,7 @@ using GFramework.Core.IoC;
 using GFramework.Core.Logging;
 using GFramework.Core.Query;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     ArchitectureContext类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs
rename to GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
index d4c570a..a8d92f9 100644
--- a/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs
+++ b/GFramework.Core.Tests/Architectures/ArchitectureServicesTests.cs
@@ -16,7 +16,7 @@ using GFramework.Core.Query;
 using Mediator;
 using ICommand = GFramework.Core.Abstractions.Command.ICommand;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     ArchitectureServices类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs b/GFramework.Core.Tests/Architectures/AsyncTestArchitecture.cs
similarity index 91%
rename from GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs
rename to GFramework.Core.Tests/Architectures/AsyncTestArchitecture.cs
index 56ec9a1..d260caa 100644
--- a/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs
+++ b/GFramework.Core.Tests/Architectures/AsyncTestArchitecture.cs
@@ -1,7 +1,7 @@
 using GFramework.Core.Tests.Model;
 using GFramework.Core.Tests.Systems;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     异步测试架构，用于测试异步模型和系统的初始化
diff --git a/GFramework.Core.Tests/Architecture/ContextProviderTests.cs b/GFramework.Core.Tests/Architectures/ContextProviderTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/ContextProviderTests.cs
rename to GFramework.Core.Tests/Architectures/ContextProviderTests.cs
index 1b81795..2e5ad0c 100644
--- a/GFramework.Core.Tests/Architecture/ContextProviderTests.cs
+++ b/GFramework.Core.Tests/Architectures/ContextProviderTests.cs
@@ -1,7 +1,7 @@
 using GFramework.Core.Abstractions.Architecture;
 using GFramework.Core.Architectures;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 /// ContextProvider 相关类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/GameContextTests.cs b/GFramework.Core.Tests/Architectures/GameContextTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/GameContextTests.cs
rename to GFramework.Core.Tests/Architectures/GameContextTests.cs
index 749ba12..083d21b 100644
--- a/GFramework.Core.Tests/Architecture/GameContextTests.cs
+++ b/GFramework.Core.Tests/Architectures/GameContextTests.cs
@@ -16,7 +16,7 @@ using GFramework.Core.Query;
 using Mediator;
 using ICommand = GFramework.Core.Abstractions.Command.ICommand;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     GameContext类的单元测试
@@ -215,7 +215,7 @@ public class GameContextTests
 /// <summary>
 ///     测试用的架构类，继承自Architecture
 /// </summary>
-public class TestArchitecture : Architectures.Architecture
+public class TestArchitecture : Architecture
 {
     /// <summary>
     ///     初始化方法，当前为空实现
diff --git a/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs b/GFramework.Core.Tests/Architectures/PriorityServiceTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/PriorityServiceTests.cs
rename to GFramework.Core.Tests/Architectures/PriorityServiceTests.cs
index 330b657..2242457 100644
--- a/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs
+++ b/GFramework.Core.Tests/Architectures/PriorityServiceTests.cs
@@ -7,7 +7,7 @@ using GFramework.Core.IoC;
 using GFramework.Core.Logging;
 using GFramework.Core.Model;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     优先级服务排序的集成测试
diff --git a/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
similarity index 99%
rename from GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs
rename to GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
index 0ac9b24..6c13900 100644
--- a/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs
+++ b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs
@@ -7,7 +7,7 @@ using GFramework.Core.Abstractions.Utility;
 using GFramework.Core.Architectures;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 /// RegistryInitializationHookBase 抽象基类的单元测试
diff --git a/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs b/GFramework.Core.Tests/Architectures/SyncTestArchitecture.cs
similarity index 91%
rename from GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs
rename to GFramework.Core.Tests/Architectures/SyncTestArchitecture.cs
index 91d1c19..64ad403 100644
--- a/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs
+++ b/GFramework.Core.Tests/Architectures/SyncTestArchitecture.cs
@@ -1,7 +1,7 @@
 using GFramework.Core.Tests.Model;
 using GFramework.Core.Tests.Systems;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     同步测试架构类，用于测试架构的生命周期和事件处理
diff --git a/GFramework.Core.Tests/Architecture/TestArchitectureBase.cs b/GFramework.Core.Tests/Architectures/TestArchitectureBase.cs
similarity index 91%
rename from GFramework.Core.Tests/Architecture/TestArchitectureBase.cs
rename to GFramework.Core.Tests/Architectures/TestArchitectureBase.cs
index 985f5e8..c3d5e76 100644
--- a/GFramework.Core.Tests/Architecture/TestArchitectureBase.cs
+++ b/GFramework.Core.Tests/Architectures/TestArchitectureBase.cs
@@ -1,11 +1,12 @@
 using GFramework.Core.Abstractions.Enums;
+using GFramework.Core.Architectures;
 
-namespace GFramework.Core.Tests.Architecture;
+namespace GFramework.Core.Tests.Architectures;
 
 /// <summary>
 ///     测试架构基类，提供通用的测试架构功能
 /// </summary>
-public abstract class TestArchitectureBase : Architectures.Architecture
+public abstract class TestArchitectureBase : Architecture
 {
     private Action<TestArchitectureBase>? _postRegistrationHook;
 
diff --git a/GFramework.Core.Tests/Rule/ContextAwareTests.cs b/GFramework.Core.Tests/Rule/ContextAwareTests.cs
index 81d64fd..03d38fe 100644
--- a/GFramework.Core.Tests/Rule/ContextAwareTests.cs
+++ b/GFramework.Core.Tests/Rule/ContextAwareTests.cs
@@ -2,7 +2,7 @@ using GFramework.Core.Abstractions.Architecture;
 using GFramework.Core.Abstractions.Rule;
 using GFramework.Core.Architectures;
 using GFramework.Core.Rule;
-using GFramework.Core.Tests.Architecture;
+using GFramework.Core.Tests.Architectures;
 
 namespace GFramework.Core.Tests.Rule;
 
diff --git a/GFramework.Core.Tests/Tests/ArchitectureTestsBase.cs b/GFramework.Core.Tests/Tests/ArchitectureTestsBase.cs
index 463ad22..d979ef9 100644
--- a/GFramework.Core.Tests/Tests/ArchitectureTestsBase.cs
+++ b/GFramework.Core.Tests/Tests/ArchitectureTestsBase.cs
@@ -7,7 +7,7 @@ namespace GFramework.Core.Tests.Tests;
 ///     架构测试基类，封装同步/异步共通测试逻辑
 /// </summary>
 /// <typeparam name="TArchitecture">架构类型，必须继承自Architecture</typeparam>
-public abstract class ArchitectureTestsBase<TArchitecture> where TArchitecture : Architectures.Architecture
+public abstract class ArchitectureTestsBase<TArchitecture> where TArchitecture : Architecture
 {
     protected TArchitecture? Architecture;
 
diff --git a/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs b/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs
index bd689fc..a758b40 100644
--- a/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs
+++ b/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs
@@ -1,5 +1,5 @@
 using GFramework.Core.Abstractions.Enums;
-using GFramework.Core.Tests.Architecture;
+using GFramework.Core.Tests.Architectures;
 using GFramework.Core.Tests.Model;
 using GFramework.Core.Tests.Systems;
 using NUnit.Framework.Legacy;
diff --git a/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs b/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs
index b76f0c6..751e32b 100644
--- a/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs
+++ b/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs
@@ -1,6 +1,6 @@
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Architectures;
-using GFramework.Core.Tests.Architecture;
+using GFramework.Core.Tests.Architectures;
 using GFramework.Core.Tests.Events;
 using GFramework.Core.Tests.Model;
 using GFramework.Core.Tests.Systems;