diff --git a/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs b/src/Volo.Abp/System/Collections/Generic/CollectionExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs
rename to src/Volo.Abp/System/Collections/Generic/CollectionExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs b/src/Volo.Abp/System/Collections/Generic/DictionaryExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs
rename to src/Volo.Abp/System/Collections/Generic/DictionaryExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs b/src/Volo.Abp/System/Collections/Generic/EnumerableExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs
rename to src/Volo.Abp/System/Collections/Generic/EnumerableExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs b/src/Volo.Abp/System/Collections/Generic/ListExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs
rename to src/Volo.Abp/System/Collections/Generic/ListExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs b/src/Volo.Abp/System/ComparableExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs
rename to src/Volo.Abp/System/ComparableExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs b/src/Volo.Abp/System/DayOfWeekExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs
rename to src/Volo.Abp/System/DayOfWeekExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs b/src/Volo.Abp/System/EventHandlerExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs
rename to src/Volo.Abp/System/EventHandlerExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs b/src/Volo.Abp/System/ExceptionExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs
rename to src/Volo.Abp/System/ExceptionExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/StreamExtensions.cs b/src/Volo.Abp/System/IO/StreamExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/StreamExtensions.cs
rename to src/Volo.Abp/System/IO/StreamExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs b/src/Volo.Abp/System/ObjectExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs
rename to src/Volo.Abp/System/ObjectExtensions.cs
diff --git a/src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs b/src/Volo.Abp/System/StringExtensions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs
rename to src/Volo.Abp/System/StringExtensions.cs
diff --git a/src/Volo.Abp/Volo/Check.cs b/src/Volo.Abp/Volo/Abp/Check.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Check.cs
rename to src/Volo.Abp/Volo/Abp/Check.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
similarity index 100%
rename from src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/DependencyAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/DependencyAttribute.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ExposeServicesAttribute.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IConventionalRegistrar.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IConventionalRegistrar.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IExposedServiceTypesProvider.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IExposedServiceTypesProvider.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/IOnServiceRegistredContext.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
similarity index 100%
rename from src/Volo.Abp/Microsoft/Extensions/DependencyInjection/IOnServiceRegistredContext.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IScopedDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IScopedDependency.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IServiceExposingArgs.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IServiceExposingArgs.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ISingletonDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ISingletonDependency.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ITransientDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ITransientDependency.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/OnServiceExposingArgs.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/OnServiceExposingArgs.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/OnServiceRegistredContext.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
similarity index 100%
rename from src/Volo.Abp/Microsoft/Extensions/DependencyInjection/OnServiceRegistredContext.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ServiceExposingActionList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ServiceExposingActionList.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
diff --git a/src/Volo.Abp/Volo/DependencyInjection/ServiceRegistrationActionList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
similarity index 100%
rename from src/Volo.Abp/Volo/DependencyInjection/ServiceRegistrationActionList.cs
rename to src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs