diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Masa.BuildingBlocks.Isolation.csproj b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Masa.BuildingBlocks.Isolation.csproj
index eab60dde0..e6de80c38 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Masa.BuildingBlocks.Isolation.csproj
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Masa.BuildingBlocks.Isolation.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftPackageVersion)" />
-    <FrameworkReference Include="Microsoft.AspNetCore.App"/>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Middleware/IIsolationMiddleware.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Middleware/IIsolationMiddleware.cs
index e14fea629..5549b97ef 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Middleware/IIsolationMiddleware.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Middleware/IIsolationMiddleware.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.Middleware;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface IIsolationMiddleware
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentContext.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentContext.cs
similarity index 73%
rename from src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentContext.cs
rename to src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentContext.cs
index 920f7451a..4b0505701 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentContext.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentContext.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.Environment;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface IEnvironmentContext
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentSetter.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentSetter.cs
similarity index 73%
rename from src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentSetter.cs
rename to src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentSetter.cs
index db701075f..14f8709b7 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentSetter.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentSetter.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.Environment;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface IEnvironmentSetter
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IMultiEnvironment.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IMultiEnvironment.cs
similarity index 81%
rename from src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IMultiEnvironment.cs
rename to src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IMultiEnvironment.cs
index e86cceb23..df1c3fbc7 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IMultiEnvironment.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IMultiEnvironment.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.Environment;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface IMultiEnvironment
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/IMultiTenant.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/IMultiTenant.cs
index 638f693fb..4465f0f10 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/IMultiTenant.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/IMultiTenant.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.MultiTenant;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface IMultiTenant : IMultiTenant<Guid>
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantContext.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantContext.cs
index 6d5eddb8a..735ebb128 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantContext.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantContext.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.MultiTenant;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface ITenantContext
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantSetter.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantSetter.cs
index f8cca629f..132301c9a 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantSetter.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantSetter.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.MultiTenant;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public interface ITenantSetter
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/Tenant.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/Tenant.cs
index 6fdbde873..167d0fb9f 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/Tenant.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/Tenant.cs
@@ -1,7 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Isolation.MultiTenant;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Isolation;
 
 public class Tenant
 {
diff --git a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/_Imports.cs b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/_Imports.cs
index c998d2ac1..805f090cb 100644
--- a/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/_Imports.cs
+++ b/src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/_Imports.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Routing;
 global using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiEnvironment/_Imports.cs b/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiEnvironment/_Imports.cs
index 5ff9aaa34..6bd96e10d 100644
--- a/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiEnvironment/_Imports.cs
+++ b/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiEnvironment/_Imports.cs
@@ -3,8 +3,6 @@
 
 global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.Middleware;
 global using Masa.BuildingBlocks.Isolation.Parser;
 global using Masa.Contrib.Isolation.MultiEnvironment.Middleware;
 global using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiTenant/_Imports.cs b/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiTenant/_Imports.cs
index f00d4e79a..5f9b38688 100644
--- a/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiTenant/_Imports.cs
+++ b/src/Contrib/Isolation/Masa.Contrib.Isolation.MultiTenant/_Imports.cs
@@ -3,8 +3,6 @@
 
 global using Masa.BuildingBlocks.Authentication.Identity;
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Middleware;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
 global using Masa.BuildingBlocks.Isolation.Parser;
 global using Masa.Contrib.Isolation.MultiTenant.Middleware;
 global using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs b/src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs
index 72e2dfe5e..ba5d78c48 100644
--- a/src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs
+++ b/src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs
@@ -6,9 +6,6 @@
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.Middleware;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
 global using Masa.BuildingBlocks.Isolation.Options;
 global using Masa.Contrib.Isolation.Middleware;
 global using Microsoft.AspNetCore.Http;
diff --git a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests/_Imports.cs b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests/_Imports.cs
index fad417443..f182e6681 100644
--- a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests/_Imports.cs
+++ b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests/_Imports.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.Middleware;
 global using Masa.Contrib.Isolation.MultiEnvironment.Middleware;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiTenant.Tests/_Imports.cs b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiTenant.Tests/_Imports.cs
index 3d800e35a..b843e13ce 100644
--- a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiTenant.Tests/_Imports.cs
+++ b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiTenant.Tests/_Imports.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Middleware;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
 global using Masa.Contrib.Isolation.MultiTenant.Middleware;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs
index c4c554745..faa21b970 100644
--- a/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs
+++ b/src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs
@@ -4,9 +4,7 @@
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.Middleware;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
+global using Masa.BuildingBlocks.Isolation;
 global using Masa.BuildingBlocks.Isolation.Options;
 global using Masa.BuildingBlocks.Isolation.Parser;
 global using Masa.Contrib.Isolation.MultiEnvironment;
diff --git a/src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/_Imports.cs b/src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/_Imports.cs
index 2ebc97e21..65e4da888 100644
--- a/src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/_Imports.cs
+++ b/src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/_Imports.cs
@@ -4,8 +4,6 @@
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
 global using Masa.Contrib.Data.UoW.EFCore;
 global using Masa.Contrib.Isolation.UoW.EFCore.Internal;
 global using Microsoft.EntityFrameworkCore;
diff --git a/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Tests/_Imports.cs b/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Tests/_Imports.cs
index 28ee01fcb..b5b3c362d 100644
--- a/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Tests/_Imports.cs
+++ b/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Tests/_Imports.cs
@@ -4,10 +4,8 @@
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.BuildingBlocks.Isolation.MultiTenant;
+global using Masa.BuildingBlocks.Isolation;
 global using Masa.BuildingBlocks.Isolation.Options;
-global using Masa.Contrib.Data.Contracts.EFCore;
 global using Masa.Contrib.Isolation.MultiEnvironment;
 global using Masa.Contrib.Isolation.MultiTenant;
 global using Microsoft.AspNetCore.Builder;
diff --git a/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/_Imports.cs b/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/_Imports.cs
index d0b361bc9..3d548efb5 100644
--- a/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/_Imports.cs
+++ b/src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/_Imports.cs
@@ -4,8 +4,6 @@
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Isolation;
-global using Masa.BuildingBlocks.Isolation.Environment;
-global using Masa.Contrib.Data.Contracts.EFCore;
 global using Masa.Contrib.Dispatcher.Events;
 global using Masa.Contrib.Isolation.MultiEnvironment;
 global using Masa.Contrib.Isolation.MultiTenant;