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 99806d605b..aec7b013e8 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringModule.cs
@@ -1,5 +1,4 @@
 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 7f48243fe6..09f7ae34f0 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
@@ -1,6 +1,4 @@
-using Volo.Abp.BlobStoring.Containers;
-
-namespace Volo.Abp.BlobStoring
+namespace Volo.Abp.BlobStoring
 {
     public class AbpBlobStoringOptions
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
index 5c78ccb991..c649ea3ffa 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerConfiguration
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
index 80a431867d..9475e6c355 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerConfigurationDictionary.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerConfigurationDictionary
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
similarity index 96%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
index 3acb7528b0..ee5341c1da 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactory.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
@@ -4,11 +4,10 @@ using System.Linq;
 using System.Threading;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Options;
-using Volo.Abp.BlobStoring.Providers;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerFactory : IBlobContainerFactory, ITransientDependency
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs
similarity index 94%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs
index 69b1313c91..34483c1849 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerFactoryExtensions.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactoryExtensions.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public static class BlobContainerFactoryExtensions
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs
similarity index 95%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs
index 7b86e67259..12bd91d669 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerNameAttribute.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerNameAttribute : Attribute
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerToProviderAdapter.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerToProviderAdapter.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerToProviderAdapter.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerToProviderAdapter.cs
index 0e134bf229..8ecd498a52 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/BlobContainerToProviderAdapter.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerToProviderAdapter.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.Abp.BlobStoring.Providers;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerToProviderAdapter : IBlobContainer
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderArgs.cs
similarity index 92%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderArgs.cs
index f1175e0940..fcc264977a 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderArgs.cs
@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public abstract class BlobProviderArgs
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderDeleteArgs.cs
similarity index 86%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderDeleteArgs.cs
index 3f1b78b5c1..146074d444 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderDeleteArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderDeleteArgs.cs
@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderDeleteArgs : BlobProviderArgs
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderExistsArgs.cs
similarity index 86%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderExistsArgs.cs
index 3a6d0e90c5..dee2e144f7 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderExistsArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderExistsArgs.cs
@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderExistsArgs : BlobProviderArgs
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderGetArgs.cs
similarity index 86%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderGetArgs.cs
index 3a92eb0a9c..f3087e9805 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderGetArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderGetArgs.cs
@@ -1,8 +1,7 @@
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderGetArgs : BlobProviderArgs
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderSaveArgs.cs
similarity index 94%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderSaveArgs.cs
index 9ae8faa603..d1a5f3845e 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/BlobProviderSaveArgs.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobProviderSaveArgs.cs
@@ -1,9 +1,8 @@
 using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
-using Volo.Abp.BlobStoring.Containers;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobProviderSaveArgs
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/DefaultContainer.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
similarity index 66%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/DefaultContainer.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
index 7afc3c83ac..64f907e564 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/DefaultContainer.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/DefaultContainer.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     [BlobContainerName("Default")]
     public class DefaultContainer
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs
similarity index 98%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs
index 9c96244655..a596565b5f 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainer.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainer.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobContainer<TContainer> : IBlobContainer
         where TContainer: class
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs
similarity index 92%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs
index 7171542b07..8434e3ae23 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/IBlobContainerFactory.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobContainerFactory.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobContainerFactory
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/IBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobProvider.cs
similarity index 91%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/IBlobProvider.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobProvider.cs
index 23e67502f0..be6a2dd648 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Providers/IBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobProvider.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers
+namespace Volo.Abp.BlobStoring
 {
     public interface IBlobProvider
     {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs
similarity index 97%
rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs
rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs
index a528795102..34d11bb46f 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/Containers/TypedBlobContainerWrapper.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/TypedBlobContainerWrapper.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class TypedBlobContainerWrapper<TContainer> : IBlobContainer<TContainer>
         where TContainer: class
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 9f538926ba..84193664fd 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,9 +1,8 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
-using Volo.Abp.BlobStoring.Providers.Fakes;
+using Volo.Abp.BlobStoring.Fakes;
+using Volo.Abp.BlobStoring.TestObjects;
 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 9283c6f8d0..0d150a20ea 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,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Volo.Abp.Autofac;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
-using Volo.Abp.BlobStoring.Providers;
-using Volo.Abp.BlobStoring.Providers.Fakes;
+using Volo.Abp.BlobStoring.Fakes;
+using Volo.Abp.BlobStoring.TestObjects;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.BlobStoring
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs
similarity index 93%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs
index 70c6c509ad..359470106e 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerFactory_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerFactory_Tests.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using NSubstitute;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
-using Volo.Abp.BlobStoring.Providers;
-using Volo.Abp.BlobStoring.Providers.Fakes;
+using Volo.Abp.BlobStoring.Fakes;
+using Volo.Abp.BlobStoring.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerFactory_Tests : AbpBlobStoringTestBase
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs
similarity index 85%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs
index f332d1571a..242b195a0c 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainerNameAttribute_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainerNameAttribute_Tests.cs
@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerNameAttribute_Tests
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs
similarity index 91%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs
index 6e55922758..7dc74fa14c 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/BlobContainer_Injection_Tests.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/BlobContainer_Injection_Tests.cs
@@ -1,8 +1,8 @@
 using Shouldly;
-using Volo.Abp.BlobStoring.Containers.TestObjects;
+using Volo.Abp.BlobStoring.TestObjects;
 using Xunit;
 
-namespace Volo.Abp.BlobStoring.Containers
+namespace Volo.Abp.BlobStoring
 {
     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
deleted file mode 100644
index 9000e2857d..0000000000
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/Containers/TestObjects/TestContainer3.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs
deleted file mode 100644
index 8d7f8629c2..0000000000
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer3.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/Providers/Fakes/FakeBlobProvider1.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs
similarity index 94%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs
index 7eef06cb92..38fef18d66 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider1.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider1.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.Fakes
 {
     public class FakeBlobProvider1 : IBlobProvider
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs
similarity index 94%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs
index 666a862f75..dc0e40d3d8 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeBlobProvider2.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeBlobProvider2.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.Fakes
 {
     public class FakeBlobProvider2 : IBlobProvider
     {
diff --git a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs
similarity index 91%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs
index cb5754acde..e66e8b6adc 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Providers/Fakes/FakeProviders.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Fakes/FakeProviders.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.BlobStoring.Providers.Fakes
+namespace Volo.Abp.BlobStoring.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
new file mode 100644
index 0000000000..61c84a1148
--- /dev/null
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer1.cs
@@ -0,0 +1,7 @@
+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/Containers/TestObjects/TestContainer2.cs b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs
similarity index 60%
rename from framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs
rename to framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs
index 48add50d24..3193da3749 100644
--- a/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/Containers/TestObjects/TestContainer2.cs
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer2.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.BlobStoring.Containers.TestObjects
+namespace Volo.Abp.BlobStoring.TestObjects
 {
     [BlobContainerName("Test2")]
     public class TestContainer2
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
new file mode 100644
index 0000000000..b96a71c1b7
--- /dev/null
+++ b/framework/test/Volo.Abp.BlobStoring.Tests/Volo/Abp/BlobStoring/TestObjects/TestContainer3.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.TestObjects
+{
+    public class TestContainer3
+    {
+        
+    }
+}
\ No newline at end of file