diff --git a/Connected.Host.sln b/Connected.Host.sln
index ada863f..738a8cd 100644
--- a/Connected.Host.sln
+++ b/Connected.Host.sln
@@ -3,27 +3,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Host", "Connected.Host\Connected.Host.csproj", "{A2A01D43-0CEE-4E49-8EC1-F16CA92F3C30}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Host", "src\Connected.Host\Connected.Host.csproj", "{A2A01D43-0CEE-4E49-8EC1-F16CA92F3C30}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{D875F828-05A0-4A52-9A36-6F5B0370171D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\Connected.Framework\Connected.Data\Connected.Data.csproj", "{67532F27-3F13-404D-AD65-34317719059D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\Connected.Framework\src\Connected.Data\Connected.Data.csproj", "{67532F27-3F13-404D-AD65-34317719059D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types", "..\Connected.Common.Types\Connected.Common.Types\Connected.Common.Types.csproj", "{216E4481-92B6-4E52-8877-3C6D547803ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Types", "..\Connected.Common.Types\src\Connected.Common.Types\Connected.Common.Types.csproj", "{216E4481-92B6-4E52-8877-3C6D547803ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Rest", "..\Connected.Framework\Connected.Rest\Connected.Rest.csproj", "{AD931DF4-9695-4D9A-8E08-8A5041175755}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Rest", "..\Connected.Framework\src\Connected.Rest\Connected.Rest.csproj", "{AD931DF4-9695-4D9A-8E08-8A5041175755}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\Connected.Framework\Connected.Entities\Connected.Entities.csproj", "{DB941857-07B7-4CD0-B43F-32EC51B5F195}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj", "{DB941857-07B7-4CD0-B43F-32EC51B5F195}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Expressions", "..\Connected.Framework\Connected.Expressions\Connected.Expressions.csproj", "{6FCD7B5E-A42C-433A-8C2E-5BA412736F99}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Expressions", "..\Connected.Framework\src\Connected.Expressions\Connected.Expressions.csproj", "{6FCD7B5E-A42C-433A-8C2E-5BA412736F99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Interop", "..\Connected.Framework\Connected.Interop\Connected.Interop.csproj", "{84D0EAE0-724F-421A-BDA2-5DEC2D9A254C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Interop", "..\Connected.Framework\src\Connected.Interop\Connected.Interop.csproj", "{84D0EAE0-724F-421A-BDA2-5DEC2D9A254C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "..\Connected.Framework.ServiceModel.Client\Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{EBBECB6F-C996-41C4-B05A-39309A03839E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "..\Connected.Framework.ServiceModel.Client\src\Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{EBBECB6F-C996-41C4-B05A-39309A03839E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Instance", "..\Connected.Framework\Connected.Instance\Connected.Instance.csproj", "{5312A990-8797-44E2-9BA9-858D51DE3825}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Instance", "..\Connected.Framework\src\Connected.Instance\Connected.Instance.csproj", "{5312A990-8797-44E2-9BA9-858D51DE3825}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Notes", "..\Connected.Common\Connected.Common.Notes\Connected.Common.Notes.csproj", "{28F99091-B4CB-43BF-A6DF-4D47621420D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Notes", "..\Connected.Common\src\Connected.Common.Notes\Connected.Common.Notes.csproj", "{28F99091-B4CB-43BF-A6DF-4D47621420D0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.Host/Configuration/MicroServiceDescriptor.cs b/src/Connected.Host/Configuration/MicroServiceDescriptor.cs
similarity index 100%
rename from Connected.Host/Configuration/MicroServiceDescriptor.cs
rename to src/Connected.Host/Configuration/MicroServiceDescriptor.cs
diff --git a/Connected.Host/Configuration/SysConfiguration.cs b/src/Connected.Host/Configuration/SysConfiguration.cs
similarity index 100%
rename from Connected.Host/Configuration/SysConfiguration.cs
rename to src/Connected.Host/Configuration/SysConfiguration.cs
diff --git a/Connected.Host/Connected.Host.csproj b/src/Connected.Host/Connected.Host.csproj
similarity index 100%
rename from Connected.Host/Connected.Host.csproj
rename to src/Connected.Host/Connected.Host.csproj
diff --git a/Connected.Host/Program.cs b/src/Connected.Host/Program.cs
similarity index 100%
rename from Connected.Host/Program.cs
rename to src/Connected.Host/Program.cs
diff --git a/Connected.Host/Properties/launchSettings.json b/src/Connected.Host/Properties/launchSettings.json
similarity index 100%
rename from Connected.Host/Properties/launchSettings.json
rename to src/Connected.Host/Properties/launchSettings.json
diff --git a/Connected.Host/appsettings.Development.json b/src/Connected.Host/appsettings.Development.json
similarity index 100%
rename from Connected.Host/appsettings.Development.json
rename to src/Connected.Host/appsettings.Development.json
diff --git a/Connected.Host/appsettings.json b/src/Connected.Host/appsettings.json
similarity index 100%
rename from Connected.Host/appsettings.json
rename to src/Connected.Host/appsettings.json
diff --git a/Connected.Host/sys.json b/src/Connected.Host/sys.json
similarity index 100%
rename from Connected.Host/sys.json
rename to src/Connected.Host/sys.json