diff --git a/modules/cms-kit/Volo.CmsKit.sln b/modules/cms-kit/Volo.CmsKit.sln
index 478e5c57e8..4d92e6e34b 100644
--- a/modules/cms-kit/Volo.CmsKit.sln
+++ b/modules/cms-kit/Volo.CmsKit.sln
@@ -49,6 +49,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Host.Shared", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.CmsKit.Web.Unified", "host\Volo.CmsKit.Web.Unified\Volo.CmsKit.Web.Unified.csproj", "{3D872C41-E226-45C8-89C1-9D3DBD7C73F2}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unified", "unified", "{963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "public", "public", "{3C74B8E8-CB34-49C8-B02A-05E959601FEE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -140,26 +146,29 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {D64C1577-4929-4B60-939E-96DE1534891A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {78040F9E-3501-4A40-82DF-00A597710F35} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {0CE86223-D31D-4315-A1F5-87BA3EE1B844} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {F1C58097-4C08-4D88-8976-6B3389391481} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
- {36E2735F-CEAB-44C8-A6D1-2CDAFF399751} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
{C5BB573D-3030-4BCB-88B7-F6A85C32766C} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{527F645C-C1FC-406E-8479-81386C8ECF13} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{D0AD9179-125C-40B2-A8EE-CD4C1EE24BB6} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{E60895E5-79C4-447D-88B7-85CB5BA336A4} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{90CB5DC4-C040-45C7-8900-9688B26405BC} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{37B135B0-DAFE-4616-B25C-1BDF32FC44A2} = {E400416D-2895-4512-9D17-90681EEC7E0A}
- {3B7B6317-1B85-4164-8E11-75574F80AE17} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
{1EDCD6D4-DF3A-4E3B-ABB6-C0D0B373EAB8} = {CCD2960C-23CC-4AB4-B84D-60C7AAA52F4D}
{73513786-B6C6-4A21-89C5-0FBDD0A46107} = {E400416D-2895-4512-9D17-90681EEC7E0A}
{690203F4-3CD5-4569-88D9-EE831EEA5F5F} = {E400416D-2895-4512-9D17-90681EEC7E0A}
{F6AC8D4A-EDD7-4514-8E8A-5BCB019864DB} = {E400416D-2895-4512-9D17-90681EEC7E0A}
{3D872C41-E226-45C8-89C1-9D3DBD7C73F2} = {E400416D-2895-4512-9D17-90681EEC7E0A}
+ {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+ {F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
+ {D64C1577-4929-4B60-939E-96DE1534891A} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
+ {F1C58097-4C08-4D88-8976-6B3389391481} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
+ {0CE86223-D31D-4315-A1F5-87BA3EE1B844} = {DDE20914-DD1B-4C7B-86FF-F21E6B5DF1D1}
+ {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+ {78040F9E-3501-4A40-82DF-00A597710F35} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}
+ {BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}
+ {077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}
+ {36E2735F-CEAB-44C8-A6D1-2CDAFF399751} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}
+ {3B7B6317-1B85-4164-8E11-75574F80AE17} = {963FBC0A-1FBA-47DA-8A61-8F57D3EC8D49}
+ {3C74B8E8-CB34-49C8-B02A-05E959601FEE} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
index 3e557b3ebd..6cda6e3bc2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
@@ -4,7 +4,7 @@
netstandard2.0
- Volo.CmsKit
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/CmsKitApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/CmsKitApplicationContractsModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Permissions/CmsKitPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Permissions/CmsKitPermissionDefinitionProvider.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissionDefinitionProvider.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Permissions/CmsKitPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Permissions/CmsKitPermissions.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPermissions.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/CreateReactionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/CreateReactionDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/GetReactionResultDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/GetReactionResultDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/GetReactionResultDto.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/IReactionAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/IReactionAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/IReactionAppService.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/ReactionCountDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Reactions/ReactionCountDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Reactions/ReactionCountDto.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Samples/ISampleAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Samples/ISampleAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/ISampleAppService.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Samples/SampleDto.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Samples/SampleDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/Samples/SampleDto.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
index 7112727f54..899a46d18f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
@@ -4,7 +4,7 @@
netstandard2.0
- Volo.CmsKit
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/CmsKitAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application/CmsKitAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitAppService.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/CmsKitApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application/CmsKitApplicationAutoMapperProfile.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationAutoMapperProfile.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/CmsKitApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application/CmsKitApplicationModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Reactions/ReactionAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application/Reactions/ReactionAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Reactions/ReactionAppService.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Samples/SampleAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Application/Samples/SampleAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/Samples/SampleAppService.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj
index 2ca97a1bb8..0126e79eb4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo.CmsKit.Domain.Shared.csproj
@@ -4,8 +4,8 @@
netstandard2.0
- Volo.CmsKit
true
+
@@ -19,6 +19,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/CmsKitDomainSharedModule.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/CmsKitDomainSharedModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitDomainSharedModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/CmsKitErrorCodes.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/CmsKitErrorCodes.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/cs.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/cs.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/cs.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/cs.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/en.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/en.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/en.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/pl-PL.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/pl-PL.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/pl-PL.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/pl-PL.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/pt-BR.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/pt-BR.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/pt-BR.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/pt-BR.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/sl.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/sl.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/sl.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/sl.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/tr.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/tr.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/tr.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/vi.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/vi.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/vi.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/vi.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/zh-Hans.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/zh-Hans.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/zh-Hans.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/zh-Hans.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/zh-Hant.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/zh-Hant.json
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKit/zh-Hant.json
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKit/zh-Hant.json
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKitResource.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKitResource.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Localization/CmsKitResource.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/CmsKitResource.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj
index a39722c3e2..900ddd0f38 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.csproj
@@ -4,7 +4,7 @@
netstandard2.0
- Volo.CmsKit
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/CmsKitDbProperties.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDbProperties.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain/CmsKitDbProperties.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDbProperties.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/CmsKitDomainModule.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain/CmsKitDomainModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDomainModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Reactions/Reaction.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/Reaction.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain/Reactions/Reaction.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/Reaction.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Settings/CmsKitSettingDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain/Settings/CmsKitSettingDefinitionProvider.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettingDefinitionProvider.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Settings/CmsKitSettings.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.Domain/Settings/CmsKitSettings.cs
rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Settings/CmsKitSettings.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj
index fe4188aff0..60d4c008b0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo.CmsKit.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
netstandard2.0
- Volo.CmsKit
+
@@ -12,4 +12,8 @@
+
+
+
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitDbContext.cs
rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitModelBuilderConfigurationOptions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitModelBuilderConfigurationOptions.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/CmsKitModelBuilderConfigurationOptions.cs
rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitModelBuilderConfigurationOptions.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/ICmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/EntityFrameworkCore/ICmsKitDbContext.cs
rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
index 408e6fe7fe..aa6411ae53 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo.CmsKit.HttpApi.Client.csproj
@@ -4,7 +4,7 @@
netstandard2.0
- Volo.CmsKit
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/CmsKitHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/CmsKitHttpApiClientModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj
index 85d1e24fae..aade317954 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo.CmsKit.HttpApi.csproj
@@ -4,7 +4,7 @@
netcoreapp3.1
- Volo.CmsKit
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/CmsKitController.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.HttpApi/CmsKitController.cs
rename to modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitController.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/CmsKitHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.HttpApi/CmsKitHttpApiModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Samples/SampleController.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.HttpApi/Samples/SampleController.cs
rename to modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/Samples/SampleController.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
index ab5743362d..5f6a941029 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
@@ -4,7 +4,7 @@
netcoreapp3.1
- Volo.CmsKit
+
@@ -12,4 +12,8 @@
+
+
+
+
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbContext.cs
rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbContextExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbContextExtensions.cs
rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbModule.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoDbModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoModelBuilderConfigurationOptions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoModelBuilderConfigurationOptions.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/CmsKitMongoModelBuilderConfigurationOptions.cs
rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoModelBuilderConfigurationOptions.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
similarity index 100%
rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/MongoDB/ICmsKitMongoDbContext.cs
rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs