diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs
index 51b000f30c..d2c4aa87bc 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.BlobStoring.Containers;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.BlobStoring
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
index 09f7ae34f0..7f48243fe6 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
@@ -1,4 +1,6 @@
-namespace Volo.Abp.BlobStoring
+using Volo.Abp.BlobStoring.Containers;
+
+namespace Volo.Abp.BlobStoring
 {
     public class AbpBlobStoringOptions
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs
index c649ea3ffa..5c78ccb991 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerConfiguration
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs
index 9475e6c355..80a431867d 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerConfigurationDictionary
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs
index 3ea949071c..3acb7528b0 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs
@@ -8,7 +8,7 @@ using Volo.Abp.BlobStoring.Providers;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerFactory : IBlobContainerFactory, ITransientDependency
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs
similarity index 94%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs
index 34483c1849..69b1313c91 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public static class BlobContainerFactoryExtensions
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs
similarity index 95%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs
index 12bd91d669..7b86e67259 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerNameAttribute : Attribute
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs
similarity index 98%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs
index a596565b5f..9c96244655 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public interface IBlobContainer<TContainer> : IBlobContainer
         where TContainer: class
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs
similarity index 92%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs
index 8434e3ae23..7171542b07 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public interface IBlobContainerFactory
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs
index 34d11bb46f..a528795102 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class TypedBlobContainerWrapper<TContainer> : IBlobContainer<TContainer>
         where TContainer: class
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobContainerToProviderAdapter.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobContainerToProviderAdapter.cs
index c4aa6e9c6f..14f1128329 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobContainerToProviderAdapter.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobContainerToProviderAdapter.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs
index dc7029f3a2..f1175e0940 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using JetBrains.Annotations;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs
index e7545a0241..3f1b78b5c1 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using JetBrains.Annotations;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs
index 686c438d08..3a6d0e90c5 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using JetBrains.Annotations;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs
index 949cc1053c..3a92eb0a9c 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using JetBrains.Annotations;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs
index fb482f8e5a..9ae8faa603 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
+using Volo.Abp.BlobStoring.Containers;
 
 namespace Volo.Abp.BlobStoring.Providers
 {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj b/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj
index 5ae7e10c44..c6e16a39b2 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj
@@ -14,4 +14,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Volo\Abp\BlobStoring\Providers" />
+  </ItemGroup>
+
 </Project>
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
index 84193664fd..9f538926ba 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringOptions_Tests.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 using Shouldly;
-using Volo.Abp.BlobStoring.Fakes;
-using Volo.Abp.BlobStoring.TestObjects;
+using Volo.Abp.BlobStoring.Containers;
+using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.Providers.Fakes;
 using Xunit;
 
 namespace Volo.Abp.BlobStoring
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
index 041f9e19f4..9283c6f8d0 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/AbpBlobStoringTestModule.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Volo.Abp.Autofac;
-using Volo.Abp.BlobStoring.Fakes;
+using Volo.Abp.BlobStoring.Containers.TestObjects;
 using Volo.Abp.BlobStoring.Providers;
-using Volo.Abp.BlobStoring.TestObjects;
+using Volo.Abp.BlobStoring.Providers.Fakes;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.BlobStoring
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs
similarity index 94%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs
index 47afbf7336..70c6c509ad 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs
@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using NSubstitute;
-using Shouldly;
-using Volo.Abp.BlobStoring.Fakes;
+using Volo.Abp.BlobStoring.Containers.TestObjects;
 using Volo.Abp.BlobStoring.Providers;
-using Volo.Abp.BlobStoring.TestObjects;
+using Volo.Abp.BlobStoring.Providers.Fakes;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerFactory_Tests : AbpBlobStoringTestBase
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs
similarity index 85%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs
index 242b195a0c..f332d1571a 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs
@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.TestObjects;
+using Volo.Abp.BlobStoring.Containers.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainerNameAttribute_Tests
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs
similarity index 87%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs
index aef26f991b..bc5eb79d9f 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs
@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.TestObjects;
+using Volo.Abp.BlobStoring.Containers.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring.Containers
 {
     public class BlobContainer_Injection_Tests : AbpBlobStoringTestBase
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer1.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer1.cs
new file mode 100644
index 0000000000..9000e2857d
--- /dev/null
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer1.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Containers.TestObjects
+{
+    public class TestContainer1
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs
similarity index 60%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs
index 3193da3749..48add50d24 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.BlobStoring.TestObjects
+namespace Volo.Abp.BlobStoring.Containers.TestObjects
 {
     [BlobContainerName("Test2")]
     public class TestContainer2
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs
new file mode 100644
index 0000000000..8d7f8629c2
--- /dev/null
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Containers.TestObjects
+{
+    public class TestContainer3
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs
similarity index 91%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs
index 4eb401e0fb..7eef06cb92 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs
@@ -1,8 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
-using Volo.Abp.BlobStoring.Providers;
 
-namespace Volo.Abp.BlobStoring.Fakes
+namespace Volo.Abp.BlobStoring.Providers.Fakes
 {
     public class FakeBlobProvider1 : IBlobProvider
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs
similarity index 91%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs
index 233bed8d16..666a862f75 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs
@@ -1,8 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
-using Volo.Abp.BlobStoring.Providers;
 
-namespace Volo.Abp.BlobStoring.Fakes
+namespace Volo.Abp.BlobStoring.Providers.Fakes
 {
     public class FakeBlobProvider2 : IBlobProvider
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs
similarity index 86%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs
index 045f835e59..cb5754acde 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Volo.Abp.BlobStoring.Providers;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.BlobStoring.Fakes
+namespace Volo.Abp.BlobStoring.Providers.Fakes
 {
     public class FakeProviders : ISingletonDependency
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer1.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer1.cs
deleted file mode 100644
index 61c84a1148..0000000000
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Volo.Abp.BlobStoring.TestObjects
-{
-    public class TestContainer1
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer3.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer3.cs
deleted file mode 100644
index b96a71c1b7..0000000000
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer3.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Volo.Abp.BlobStoring.TestObjects
-{
-    public class TestContainer3
-    {
-        
-    }
-}
\ No newline at end of file