diff --git a/Connected.Host.UI.sln b/Connected.Host.UI.sln
index 6c664e4..92b6b3d 100644
--- a/Connected.Host.UI.sln
+++ b/Connected.Host.UI.sln
@@ -5,23 +5,23 @@ VisualStudioVersion = 17.4.32916.344
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{371C0F2E-F0AA-4924-BF79-0F2A473B5C3D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\Connected.Client\Connected.Client.csproj", "{D593BBE3-4E78-4682-9504-5AEEFAC0D55B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\src\onnected.Client\Connected.Client.csproj", "{D593BBE3-4E78-4682-9504-5AEEFAC0D55B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{5546A8B8-1088-4E38-A677-CF0DE6848131}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{5546A8B8-1088-4E38-A677-CF0DE6848131}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Host.UI", "Connected.Host.UI\Connected.Host.UI.csproj", "{B49E8F8C-848F-42F7-BA80-9ED4BD7DCFB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Host.UI", "src\Connected.Host.UI\Connected.Host.UI.csproj", "{B49E8F8C-848F-42F7-BA80-9ED4BD7DCFB8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Client", "..\connected.common.types\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj", "{3F53F515-CDAF-4F12-A022-59AEF1FD6F87}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Client", "..\connected.common.types\src\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj", "{3F53F515-CDAF-4F12-A022-59AEF1FD6F87}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "..\connected.common.types\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{E5E3BAD7-D82C-4AB7-9B22-068344D5048C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "..\connected.common.types\src\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{E5E3BAD7-D82C-4AB7-9B22-068344D5048C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.UI", "..\connected.common.types\Connected.Common.Types.UI\Connected.Common.Types.UI.csproj", "{5453DFE4-4D0B-41B5-A912-78A2FA9261DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.UI", "..\connected.common.types\src\Connected.Common.Types.UI\Connected.Common.Types.UI.csproj", "{5453DFE4-4D0B-41B5-A912-78A2FA9261DE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\Connected.Components\Connected.Components.csproj", "{877833B3-9367-484A-86F2-C1F3C371BD8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\src\Connected.Components\Connected.Components.csproj", "{877833B3-9367-484A-86F2-C1F3C371BD8C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components.Showcase", "..\connected.components\Connected.Components.Showcase\Connected.Components.Showcase.csproj", "{7AB90B46-6C92-4F25-BCB4-3654F8E18E2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components.Showcase", "..\connected.components\src\Connected.Components.Showcase\Connected.Components.Showcase.csproj", "{7AB90B46-6C92-4F25-BCB4-3654F8E18E2D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\Connected.UI\Connected.UI.csproj", "{FC8918A9-8C5B-46EF-8493-F32AFF0CCDA7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\src\Connected.UI\Connected.UI.csproj", "{FC8918A9-8C5B-46EF-8493-F32AFF0CCDA7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.Host.UI/Connected.Host.UI.csproj b/Connected.Host.UI/Connected.Host.UI.csproj
deleted file mode 100644
index 41e1689..0000000
--- a/Connected.Host.UI/Connected.Host.UI.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- net7.0
- enable
- enable
- Connected.Host
- service-worker-assets.js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Connected.Host.UI/App.razor b/src/Connected.Host.UI/App.razor
similarity index 100%
rename from Connected.Host.UI/App.razor
rename to src/Connected.Host.UI/App.razor
diff --git a/src/Connected.Host.UI/Connected.Host.UI.csproj b/src/Connected.Host.UI/Connected.Host.UI.csproj
new file mode 100644
index 0000000..4eda661
--- /dev/null
+++ b/src/Connected.Host.UI/Connected.Host.UI.csproj
@@ -0,0 +1,30 @@
+
+
+
+ net7.0
+ enable
+ enable
+ Connected.Host
+ service-worker-assets.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Connected.Host.UI/Program.cs b/src/Connected.Host.UI/Program.cs
similarity index 100%
rename from Connected.Host.UI/Program.cs
rename to src/Connected.Host.UI/Program.cs
diff --git a/Connected.Host.UI/Properties/launchSettings.json b/src/Connected.Host.UI/Properties/launchSettings.json
similarity index 100%
rename from Connected.Host.UI/Properties/launchSettings.json
rename to src/Connected.Host.UI/Properties/launchSettings.json
diff --git a/Connected.Host.UI/wwwroot/index.html b/src/Connected.Host.UI/wwwroot/index.html
similarity index 100%
rename from Connected.Host.UI/wwwroot/index.html
rename to src/Connected.Host.UI/wwwroot/index.html
diff --git a/Connected.Host.UI/wwwroot/service-worker.js b/src/Connected.Host.UI/wwwroot/service-worker.js
similarity index 100%
rename from Connected.Host.UI/wwwroot/service-worker.js
rename to src/Connected.Host.UI/wwwroot/service-worker.js
diff --git a/Connected.Host.UI/wwwroot/service-worker.published.js b/src/Connected.Host.UI/wwwroot/service-worker.published.js
similarity index 100%
rename from Connected.Host.UI/wwwroot/service-worker.published.js
rename to src/Connected.Host.UI/wwwroot/service-worker.published.js