diff --git a/src/Volo.Abp/System/Globalization/AbpCultureHelper.cs b/src/Volo.Abp/Volo/Abp/Globalization/AbpCultureHelper.cs
similarity index 98%
rename from src/Volo.Abp/System/Globalization/AbpCultureHelper.cs
rename to src/Volo.Abp/Volo/Abp/Globalization/AbpCultureHelper.cs
index c42e0e2091..c1cdfeb430 100644
--- a/src/Volo.Abp/System/Globalization/AbpCultureHelper.cs
+++ b/src/Volo.Abp/Volo/Abp/Globalization/AbpCultureHelper.cs
@@ -1,5 +1,4 @@
 using JetBrains.Annotations;
-using Volo;
 using Volo.Abp;
 
 namespace System.Globalization
diff --git a/test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs b/test/Volo.Abp.Tests/System/ComparableExtensions_Tests.cs
similarity index 91%
rename from test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs
rename to test/Volo.Abp.Tests/System/ComparableExtensions_Tests.cs
index 61805523bf..83e24c98fa 100644
--- a/test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs
+++ b/test/Volo.Abp.Tests/System/ComparableExtensions_Tests.cs
@@ -1,8 +1,7 @@
-using System;
-using Shouldly;
+using Shouldly;
 using Xunit;
 
-namespace Volo.ExtensionMethods
+namespace System
 {
     public class ComparableExtensions_Tests
     {
diff --git a/test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs b/test/Volo.Abp.Tests/System/DayOfWeekExtensions_Tests.cs
similarity index 94%
rename from test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs
rename to test/Volo.Abp.Tests/System/DayOfWeekExtensions_Tests.cs
index 97874ca977..040ff58eb5 100644
--- a/test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs
+++ b/test/Volo.Abp.Tests/System/DayOfWeekExtensions_Tests.cs
@@ -1,8 +1,7 @@
-using System;
 using Shouldly;
 using Xunit;
 
-namespace Volo.ExtensionMethods
+namespace System
 {
     public class DayOfWeekExtensions_Tests
     {
diff --git a/test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs b/test/Volo.Abp.Tests/System/ObjectExtension_Test.cs
similarity index 95%
rename from test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs
rename to test/Volo.Abp.Tests/System/ObjectExtension_Test.cs
index df395c323c..c84063039b 100644
--- a/test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs
+++ b/test/Volo.Abp.Tests/System/ObjectExtension_Test.cs
@@ -1,8 +1,7 @@
-using System;
-using Shouldly;
+using Shouldly;
 using Xunit;
 
-namespace Volo.ExtensionMethods
+namespace System
 {
     public class ObjectExtensions_Tests
     {
diff --git a/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs b/test/Volo.Abp.Tests/System/StringExtensions_Tests.cs
similarity index 98%
rename from test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs
rename to test/Volo.Abp.Tests/System/StringExtensions_Tests.cs
index 6d0b740a7a..7cfe036706 100644
--- a/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs
+++ b/test/Volo.Abp.Tests/System/StringExtensions_Tests.cs
@@ -1,9 +1,8 @@
-using System;
+using Shouldly;
 using System.Globalization;
-using Shouldly;
 using Xunit;
 
-namespace Volo.ExtensionMethods
+namespace System
 {
     public class StringExtensions_Tests : IDisposable
     {
diff --git a/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs b/test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs
similarity index 90%
rename from test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
rename to test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs
index 84459898b3..529290d0a1 100644
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/AutoRegistrationHelper_Tests.cs
@@ -1,10 +1,9 @@
-using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
+using System.Linq;
 using Xunit;
-using Volo.Abp.DependencyInjection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class AutoRegistrationHelper_Tests
     {
diff --git a/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs b/test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/ConventionalRegistrar_Test.cs
similarity index 95%
rename from test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
rename to test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/ConventionalRegistrar_Test.cs
index 011514e5a1..30e8cadeaf 100644
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/DependencyInjection/ConventionalRegistrar_Test.cs
@@ -1,8 +1,8 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
+using Shouldly;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class ConventionalRegistrar_Tests
     {
diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs b/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs
index 19fb5270e2..fc43e31525 100644
--- a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs
@@ -1,5 +1,4 @@
 using Volo.Abp.TestBase.Logging;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.DynamicProxy
 {