diff --git a/WASM/App.razor b/WASM/BpmnEditor/App.razor
similarity index 100%
rename from WASM/App.razor
rename to WASM/BpmnEditor/App.razor
diff --git a/WASM/BPMNEditor.csproj b/WASM/BpmnEditor/BPMNEditor.csproj
similarity index 95%
rename from WASM/BPMNEditor.csproj
rename to WASM/BpmnEditor/BPMNEditor.csproj
index 2502525..5421b56 100644
--- a/WASM/BPMNEditor.csproj
+++ b/WASM/BpmnEditor/BPMNEditor.csproj
@@ -41,7 +41,7 @@
     <None Include="wwwroot\css\open-iconic\README.md" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Common\BlazorWasmCommon_NET6.csproj" />
+    <ProjectReference Include="..\..\common\BlazorWasmCommon_NET6.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/WASM/BPMNEditor.sln b/WASM/BpmnEditor/BPMNEditor.sln
similarity index 52%
rename from WASM/BPMNEditor.sln
rename to WASM/BpmnEditor/BPMNEditor.sln
index 936dbb5..2d54d02 100644
--- a/WASM/BPMNEditor.sln
+++ b/WASM/BpmnEditor/BPMNEditor.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPMNEditor", "BPMNEditor.csproj", "{D0CEB6F0-E005-4218-BCED-78542DA0740B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPMNEditor", "BPMNEditor.csproj", "{14CED2C6-EB3B-42A8-BCD7-830827314C67}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWasmCommon_NET6", "..\Common\BlazorWasmCommon_NET6.csproj", "{00AB184E-53E4-4CF4-B486-5BBEA89A7457}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWasmCommon_NET6", "..\..\common\BlazorWasmCommon_NET6.csproj", "{1BE70572-766B-4A78-95D8-668752C39AD4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +13,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D0CEB6F0-E005-4218-BCED-78542DA0740B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0CEB6F0-E005-4218-BCED-78542DA0740B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0CEB6F0-E005-4218-BCED-78542DA0740B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0CEB6F0-E005-4218-BCED-78542DA0740B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00AB184E-53E4-4CF4-B486-5BBEA89A7457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00AB184E-53E4-4CF4-B486-5BBEA89A7457}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00AB184E-53E4-4CF4-B486-5BBEA89A7457}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00AB184E-53E4-4CF4-B486-5BBEA89A7457}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14CED2C6-EB3B-42A8-BCD7-830827314C67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14CED2C6-EB3B-42A8-BCD7-830827314C67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14CED2C6-EB3B-42A8-BCD7-830827314C67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14CED2C6-EB3B-42A8-BCD7-830827314C67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BE70572-766B-4A78-95D8-668752C39AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BE70572-766B-4A78-95D8-668752C39AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BE70572-766B-4A78-95D8-668752C39AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BE70572-766B-4A78-95D8-668752C39AD4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7F521E49-4FC4-4A8D-A151-7681CABD4504}
+		SolutionGuid = {10A8EAF7-1E0C-4AA3-8356-80601777773D}
 	EndGlobalSection
 EndGlobal
diff --git a/WASM/NuGet.config b/WASM/BpmnEditor/NuGet.config
similarity index 92%
rename from WASM/NuGet.config
rename to WASM/BpmnEditor/NuGet.config
index 97c1d2a..4878e14 100644
--- a/WASM/NuGet.config
+++ b/WASM/BpmnEditor/NuGet.config
@@ -3,6 +3,7 @@
   <packageSources>
     <clear />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+    <!-- Resources -->
   </packageSources>
   <config>
     <add key="dependencyVersion" value="Highest" />
diff --git a/WASM/Program.cs b/WASM/BpmnEditor/Program.cs
similarity index 100%
rename from WASM/Program.cs
rename to WASM/BpmnEditor/Program.cs
diff --git a/WASM/Properties/PublishProfiles/FolderProfile.pubxml b/WASM/BpmnEditor/Properties/PublishProfiles/FolderProfile.pubxml
similarity index 100%
rename from WASM/Properties/PublishProfiles/FolderProfile.pubxml
rename to WASM/BpmnEditor/Properties/PublishProfiles/FolderProfile.pubxml
diff --git a/WASM/Properties/PublishProfiles/FolderProfile.pubxml.user b/WASM/BpmnEditor/Properties/PublishProfiles/FolderProfile.pubxml.user
similarity index 100%
rename from WASM/Properties/PublishProfiles/FolderProfile.pubxml.user
rename to WASM/BpmnEditor/Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/WASM/Properties/launchSettings.json b/WASM/BpmnEditor/Properties/launchSettings.json
similarity index 100%
rename from WASM/Properties/launchSettings.json
rename to WASM/BpmnEditor/Properties/launchSettings.json
diff --git a/WASM/Shared/MainLayout.razor b/WASM/BpmnEditor/Shared/MainLayout.razor
similarity index 100%
rename from WASM/Shared/MainLayout.razor
rename to WASM/BpmnEditor/Shared/MainLayout.razor
diff --git a/WASM/Shared/NavMenu.razor b/WASM/BpmnEditor/Shared/NavMenu.razor
similarity index 100%
rename from WASM/Shared/NavMenu.razor
rename to WASM/BpmnEditor/Shared/NavMenu.razor
diff --git a/WASM/Shared/NavMenu.razor.css b/WASM/BpmnEditor/Shared/NavMenu.razor.css
similarity index 100%
rename from WASM/Shared/NavMenu.razor.css
rename to WASM/BpmnEditor/Shared/NavMenu.razor.css
diff --git a/WASM/Shared/SampleComponentBase.cs b/WASM/BpmnEditor/Shared/SampleComponentBase.cs
similarity index 100%
rename from WASM/Shared/SampleComponentBase.cs
rename to WASM/BpmnEditor/Shared/SampleComponentBase.cs
diff --git a/WASM/Shared/SampleService.cs b/WASM/BpmnEditor/Shared/SampleService.cs
similarity index 100%
rename from WASM/Shared/SampleService.cs
rename to WASM/BpmnEditor/Shared/SampleService.cs
diff --git a/WASM/Shared/SpinnerComponent.razor b/WASM/BpmnEditor/Shared/SpinnerComponent.razor
similarity index 100%
rename from WASM/Shared/SpinnerComponent.razor
rename to WASM/BpmnEditor/Shared/SpinnerComponent.razor
diff --git a/WASM/Shared/SurveyPrompt.razor b/WASM/BpmnEditor/Shared/SurveyPrompt.razor
similarity index 100%
rename from WASM/Shared/SurveyPrompt.razor
rename to WASM/BpmnEditor/Shared/SurveyPrompt.razor
diff --git a/WASM/_Imports.razor b/WASM/BpmnEditor/_Imports.razor
similarity index 100%
rename from WASM/_Imports.razor
rename to WASM/BpmnEditor/_Imports.razor
diff --git a/WASM/wwwroot/favicon.ico b/WASM/BpmnEditor/wwwroot/favicon.ico
similarity index 100%
rename from WASM/wwwroot/favicon.ico
rename to WASM/BpmnEditor/wwwroot/favicon.ico
diff --git a/WASM/wwwroot/index.html b/WASM/BpmnEditor/wwwroot/index.html
similarity index 100%
rename from WASM/wwwroot/index.html
rename to WASM/BpmnEditor/wwwroot/index.html