diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index 24da97991b..7cb5090f58 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -168,11 +168,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MongoDB.Tests", "t
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.SqlServer", "src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj", "{6EABA98D-0B71-4ED7-A939-AFDA106D1151}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed", "src\Volo.Abp.EventBus.Distributed\Volo.Abp.EventBus.Distributed.csproj", "{CFC98B88-8CCC-469B-8D60-482D3C94A690}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed.RabbitMQ", "src\Volo.Abp.EventBus.Distributed.RabbitMQ\Volo.Abp.EventBus.Distributed.RabbitMQ.csproj", "{468C3DCB-8C00-40E7-AE51-0738EAAB312A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed.Tests", "test\Volo.Abp.EventBus.Distributed.Tests\Volo.Abp.EventBus.Distributed.Tests.csproj", "{0AE814CE-E155-4259-8746-262D174AB510}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.RabbitMQ", "src\Volo.Abp.EventBus.Distributed.RabbitMQ\Volo.Abp.EventBus.RabbitMQ.csproj", "{468C3DCB-8C00-40E7-AE51-0738EAAB312A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", "src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj", "{2F5EE6D9-511B-4998-BD62-0B9F03E02432}"
 EndProject
@@ -512,18 +508,10 @@ Global
 		{6EABA98D-0B71-4ED7-A939-AFDA106D1151}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EABA98D-0B71-4ED7-A939-AFDA106D1151}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EABA98D-0B71-4ED7-A939-AFDA106D1151}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFC98B88-8CCC-469B-8D60-482D3C94A690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFC98B88-8CCC-469B-8D60-482D3C94A690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFC98B88-8CCC-469B-8D60-482D3C94A690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFC98B88-8CCC-469B-8D60-482D3C94A690}.Release|Any CPU.Build.0 = Release|Any CPU
 		{468C3DCB-8C00-40E7-AE51-0738EAAB312A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{468C3DCB-8C00-40E7-AE51-0738EAAB312A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{468C3DCB-8C00-40E7-AE51-0738EAAB312A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{468C3DCB-8C00-40E7-AE51-0738EAAB312A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AE814CE-E155-4259-8746-262D174AB510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AE814CE-E155-4259-8746-262D174AB510}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AE814CE-E155-4259-8746-262D174AB510}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AE814CE-E155-4259-8746-262D174AB510}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -684,9 +672,7 @@ Global
 		{D5733D90-8C3D-4026-85E2-41DED26C4938} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{82ED4DD2-DEF8-40D5-9BF9-663AFD35B06D} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{6EABA98D-0B71-4ED7-A939-AFDA106D1151} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
-		{CFC98B88-8CCC-469B-8D60-482D3C94A690} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{468C3DCB-8C00-40E7-AE51-0738EAAB312A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
-		{0AE814CE-E155-4259-8746-262D174AB510} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{2F5EE6D9-511B-4998-BD62-0B9F03E02432} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{7E0517E0-AE09-4E10-8469-308F065F2F43} = {447C8A77-E5F0-4538-8687-7383196D04EA}
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs
index d5233c7956..73d189f1d3 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs
@@ -12,7 +12,8 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem
             AllowedExtraWebContentFolders = new List<string>
             {
                 "/Pages",
-                "/Views"
+                "/Views",
+                "/Themes"
             };
 
             AllowedExtraWebContentFileExtensions = new List<string>
diff --git a/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.Distributed.RabbitMQ.csproj b/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.csproj
similarity index 74%
rename from framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.Distributed.RabbitMQ.csproj
rename to framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.csproj
index 17875a91ab..04d57417e1 100644
--- a/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.Distributed.RabbitMQ.csproj
+++ b/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo.Abp.EventBus.RabbitMQ.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\common.props" />
 
@@ -14,11 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RabbitMQ.Client" Version="5.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.EventBus.Distributed\Volo.Abp.EventBus.Distributed.csproj" />
+    <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
+    <ProjectReference Include="..\Volo.Abp.RabbitMQ\Volo.Abp.RabbitMQ.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo/Abp/EventBus/Distributed/RabbitMq/AbpRabbitMqDistributedEventBusModule.cs b/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo/Abp/EventBus/Distributed/RabbitMq/AbpRabbitMqDistributedEventBusModule.cs
index 0c5f97762a..a4e4c86829 100644
--- a/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo/Abp/EventBus/Distributed/RabbitMq/AbpRabbitMqDistributedEventBusModule.cs
+++ b/framework/src/Volo.Abp.EventBus.Distributed.RabbitMQ/Volo/Abp/EventBus/Distributed/RabbitMq/AbpRabbitMqDistributedEventBusModule.cs
@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.EventBus.Distributed.RabbitMq
 {
-    [DependsOn(typeof(AbpDistributedEventBusModule))]
+    [DependsOn(typeof(AbpEventBusModule))]
     public class AbpRabbitMqDistributedEventBusModule : AbpModule
     {
 
diff --git a/framework/src/Volo.Abp.EventBus.Distributed/Volo.Abp.EventBus.Distributed.csproj b/framework/src/Volo.Abp.EventBus.Distributed/Volo.Abp.EventBus.Distributed.csproj
deleted file mode 100644
index a1d012241c..0000000000
--- a/framework/src/Volo.Abp.EventBus.Distributed/Volo.Abp.EventBus.Distributed.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Volo.Abp.EventBus.Distributed</AssemblyName>
-    <PackageId>Volo.Abp.EventBus.Distributed</PackageId>
-    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <RootNamespace />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusModule.cs b/framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusModule.cs
deleted file mode 100644
index 040aa493e7..0000000000
--- a/framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusModule.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.EventBus.Distributed
-{
-    [DependsOn(typeof(AbpEventBusModule))]
-    public class AbpDistributedEventBusModule : AbpModule
-    {
-
-    }
-}
diff --git a/framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/IDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/IDistributedEventBus.cs
similarity index 100%
rename from framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/IDistributedEventBus.cs
rename to framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/IDistributedEventBus.cs
diff --git a/framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
similarity index 100%
rename from framework/src/Volo.Abp.EventBus.Distributed/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
rename to framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs
diff --git a/framework/test/Volo.Abp.EventBus.Distributed.Tests/Volo.Abp.EventBus.Distributed.Tests.csproj b/framework/test/Volo.Abp.EventBus.Distributed.Tests/Volo.Abp.EventBus.Distributed.Tests.csproj
deleted file mode 100644
index 96c51ba974..0000000000
--- a/framework/test/Volo.Abp.EventBus.Distributed.Tests/Volo.Abp.EventBus.Distributed.Tests.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
-    <AssemblyName>Volo.Abp.EventBus.Distributed.Tests</AssemblyName>
-    <PackageId>Volo.Abp.EventBus.Distributed.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <RootNamespace />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
-    <ProjectReference Include="..\..\src\Volo.Abp.EventBus.Distributed\Volo.Abp.EventBus.Distributed.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-  </ItemGroup>
-
-</Project>