diff --git a/Connected.Common.sln b/Connected.Common.sln
index 964d521..e7df3db 100644
--- a/Connected.Common.sln
+++ b/Connected.Common.sln
@@ -5,35 +5,35 @@ VisualStudioVersion = 17.4.32916.344
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{75ED46E6-38CD-4948-9F3C-5167A9FFD7FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common", "Connected.Common\Connected.Common.csproj", "{CB582FC6-7A9A-46D1-BA75-4A103E096674}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common", "src\Connected.Common\Connected.Common.csproj", "{CB582FC6-7A9A-46D1-BA75-4A103E096674}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{B2AE8588-0786-4556-9563-0D941A145C7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{B2AE8588-0786-4556-9563-0D941A145C7C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "Connected.Common.Model\Connected.Common.Model.csproj", "{ABF6BF35-ED9F-43A9-8581-23CBD9701E94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "src\Connected.Common.Model\Connected.Common.Model.csproj", "{ABF6BF35-ED9F-43A9-8581-23CBD9701E94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Notes", "Connected.Common.Notes\Connected.Common.Notes.csproj", "{05B6148F-467C-4090-8FEA-8EA16A4D9956}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Notes", "src\Connected.Common.Notes\Connected.Common.Notes.csproj", "{05B6148F-467C-4090-8FEA-8EA16A4D9956}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Notes.Model", "Connected.Common.Notes.Model\Connected.Common.Notes.Model.csproj", "{DF77BAAB-8223-4BEA-B7BA-0C087D9C6750}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Notes.Model", "src\Connected.Common.Notes.Model\Connected.Common.Notes.Model.csproj", "{DF77BAAB-8223-4BEA-B7BA-0C087D9C6750}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering.Model", "Connected.Common.Numbering.Model\Connected.Common.Numbering.Model.csproj", "{83F83DE6-28BF-4AB7-902E-42D38A54A578}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering.Model", "src\Connected.Common.Numbering.Model\Connected.Common.Numbering.Model.csproj", "{83F83DE6-28BF-4AB7-902E-42D38A54A578}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering", "Connected.Common.Numbering\Connected.Common.Numbering.csproj", "{4E810676-E37E-4C25-95FC-747BB32E5A69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering", "src\Connected.Common.Numbering\Connected.Common.Numbering.csproj", "{4E810676-E37E-4C25-95FC-747BB32E5A69}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering.Middleware", "Connected.Common.Numbering.Middleware\Connected.Common.Numbering.Middleware.csproj", "{424C1CBE-8490-431C-A0A8-1ACB22A65864}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Numbering.Middleware", "src\Connected.Common.Numbering.Middleware\Connected.Common.Numbering.Middleware.csproj", "{424C1CBE-8490-431C-A0A8-1ACB22A65864}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{09D6D582-C873-405A-8C33-9E1EFB0483DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{09D6D582-C873-405A-8C33-9E1EFB0483DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Globalization", "..\connected.framework\Connected.Globalization\Connected.Globalization.csproj", "{29AEF348-A405-4744-B797-24C30C0412DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Globalization", "..\connected.framework\src\Connected.Globalization\Connected.Globalization.csproj", "{29AEF348-A405-4744-B797-24C30C0412DE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\connected.framework\Connected.Middleware\Connected.Middleware.csproj", "{5D042895-A9FC-4BEE-8EF8-7EFDD54DB07B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\connected.framework\src\Connected.Middleware\Connected.Middleware.csproj", "{5D042895-A9FC-4BEE-8EF8-7EFDD54DB07B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Net", "..\connected.framework\Connected.Net\Connected.Net.csproj", "{FFCDE448-E330-42E2-A619-8BC9EC0FDC1E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Net", "..\connected.framework\src\Connected.Net\Connected.Net.csproj", "{FFCDE448-E330-42E2-A619-8BC9EC0FDC1E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\Connected.ServiceModel\Connected.ServiceModel.csproj", "{FE160CA1-0E4F-41F9-BD7F-C344C6F54B42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{FE160CA1-0E4F-41F9-BD7F-C344C6F54B42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{38FD6047-BEF1-4367-B96E-E7810F0284AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\src\Connected.Services\Connected.Services.csproj", "{38FD6047-BEF1-4367-B96E-E7810F0284AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Validation", "..\connected.framework\Connected.Validation\Connected.Validation.csproj", "{E4317767-4F21-4E11-B934-9E1E65547D16}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Validation", "..\connected.framework\src\Connected.Validation\Connected.Validation.csproj", "{E4317767-4F21-4E11-B934-9E1E65547D16}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.Common.Model/CommonRoutes.cs b/src/Connected.Common.Model/CommonRoutes.cs
similarity index 100%
rename from Connected.Common.Model/CommonRoutes.cs
rename to src/Connected.Common.Model/CommonRoutes.cs
diff --git a/Connected.Common.Model/Connected.Common.Model.csproj b/src/Connected.Common.Model/Connected.Common.Model.csproj
similarity index 80%
rename from Connected.Common.Model/Connected.Common.Model.csproj
rename to src/Connected.Common.Model/Connected.Common.Model.csproj
index d851f63..0509015 100644
--- a/Connected.Common.Model/Connected.Common.Model.csproj
+++ b/src/Connected.Common.Model/Connected.Common.Model.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.Common.Model/Documents/DocumentArgs.cs b/src/Connected.Common.Model/Documents/DocumentArgs.cs
similarity index 100%
rename from Connected.Common.Model/Documents/DocumentArgs.cs
rename to src/Connected.Common.Model/Documents/DocumentArgs.cs
diff --git a/Connected.Common.Model/Documents/IDocument.cs b/src/Connected.Common.Model/Documents/IDocument.cs
similarity index 100%
rename from Connected.Common.Model/Documents/IDocument.cs
rename to src/Connected.Common.Model/Documents/IDocument.cs
diff --git a/Connected.Common.Model/Documents/IDocumentService.cs b/src/Connected.Common.Model/Documents/IDocumentService.cs
similarity index 100%
rename from Connected.Common.Model/Documents/IDocumentService.cs
rename to src/Connected.Common.Model/Documents/IDocumentService.cs
diff --git a/Connected.Common.Model/Units.cs b/src/Connected.Common.Model/Units.cs
similarity index 100%
rename from Connected.Common.Model/Units.cs
rename to src/Connected.Common.Model/Units.cs
diff --git a/Connected.Common.Notes.Model/Boot.cs b/src/Connected.Common.Notes.Model/Boot.cs
similarity index 100%
rename from Connected.Common.Notes.Model/Boot.cs
rename to src/Connected.Common.Notes.Model/Boot.cs
diff --git a/Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj b/src/Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj
similarity index 82%
rename from Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj
rename to src/Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj
index 96d6617..7a2028b 100644
--- a/Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj
+++ b/src/Connected.Common.Notes.Model/Connected.Common.Notes.Model.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
     <ProjectReference Include="..\Connected.Common.Model\Connected.Common.Model.csproj" />
   </ItemGroup>
 
diff --git a/Connected.Common.Notes.Model/INote.cs b/src/Connected.Common.Notes.Model/INote.cs
similarity index 100%
rename from Connected.Common.Notes.Model/INote.cs
rename to src/Connected.Common.Notes.Model/INote.cs
diff --git a/Connected.Common.Notes.Model/INoteSearch.cs b/src/Connected.Common.Notes.Model/INoteSearch.cs
similarity index 100%
rename from Connected.Common.Notes.Model/INoteSearch.cs
rename to src/Connected.Common.Notes.Model/INoteSearch.cs
diff --git a/Connected.Common.Notes.Model/INoteService.cs b/src/Connected.Common.Notes.Model/INoteService.cs
similarity index 100%
rename from Connected.Common.Notes.Model/INoteService.cs
rename to src/Connected.Common.Notes.Model/INoteService.cs
diff --git a/Connected.Common.Notes.Model/INoteText.cs b/src/Connected.Common.Notes.Model/INoteText.cs
similarity index 100%
rename from Connected.Common.Notes.Model/INoteText.cs
rename to src/Connected.Common.Notes.Model/INoteText.cs
diff --git a/Connected.Common.Notes.Model/NoteArgs.cs b/src/Connected.Common.Notes.Model/NoteArgs.cs
similarity index 100%
rename from Connected.Common.Notes.Model/NoteArgs.cs
rename to src/Connected.Common.Notes.Model/NoteArgs.cs
diff --git a/Connected.Common.Notes.Model/NoteUrls.cs b/src/Connected.Common.Notes.Model/NoteUrls.cs
similarity index 100%
rename from Connected.Common.Notes.Model/NoteUrls.cs
rename to src/Connected.Common.Notes.Model/NoteUrls.cs
diff --git a/Connected.Common.Notes/Bootstrap.cs b/src/Connected.Common.Notes/Bootstrap.cs
similarity index 100%
rename from Connected.Common.Notes/Bootstrap.cs
rename to src/Connected.Common.Notes/Bootstrap.cs
diff --git a/Connected.Common.Notes/Connected.Common.Notes.csproj b/src/Connected.Common.Notes/Connected.Common.Notes.csproj
similarity index 53%
rename from Connected.Common.Notes/Connected.Common.Notes.csproj
rename to src/Connected.Common.Notes/Connected.Common.Notes.csproj
index e1828b7..302240e 100644
--- a/Connected.Common.Notes/Connected.Common.Notes.csproj
+++ b/src/Connected.Common.Notes/Connected.Common.Notes.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework.ServiceModel\Connected.ServiceModel\Connected.ServiceModel.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Entities\Connected.Entities.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework.ServiceModel\src\Connected.ServiceModel\Connected.ServiceModel.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
     <ProjectReference Include="..\Connected.Common.Notes.Model\Connected.Common.Notes.Model.csproj" />
     <ProjectReference Include="..\Connected.Common\Connected.Common.csproj" />
   </ItemGroup>
diff --git a/Connected.Common.Notes/Note.cs b/src/Connected.Common.Notes/Note.cs
similarity index 100%
rename from Connected.Common.Notes/Note.cs
rename to src/Connected.Common.Notes/Note.cs
diff --git a/Connected.Common.Notes/NoteOps.cs b/src/Connected.Common.Notes/NoteOps.cs
similarity index 100%
rename from Connected.Common.Notes/NoteOps.cs
rename to src/Connected.Common.Notes/NoteOps.cs
diff --git a/Connected.Common.Notes/NoteSearch.cs b/src/Connected.Common.Notes/NoteSearch.cs
similarity index 100%
rename from Connected.Common.Notes/NoteSearch.cs
rename to src/Connected.Common.Notes/NoteSearch.cs
diff --git a/Connected.Common.Notes/NoteService.cs b/src/Connected.Common.Notes/NoteService.cs
similarity index 100%
rename from Connected.Common.Notes/NoteService.cs
rename to src/Connected.Common.Notes/NoteService.cs
diff --git a/Connected.Common.Notes/NoteText.cs b/src/Connected.Common.Notes/NoteText.cs
similarity index 100%
rename from Connected.Common.Notes/NoteText.cs
rename to src/Connected.Common.Notes/NoteText.cs
diff --git a/Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj b/src/Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj
similarity index 77%
rename from Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj
rename to src/Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj
index 9523ce8..7813d1f 100644
--- a/Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj
+++ b/src/Connected.Common.Numbering.Middleware/Connected.Common.Numbering.Middleware.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework\Connected.Middleware\Connected.Middleware.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Middleware\Connected.Middleware.csproj" />
     <ProjectReference Include="..\Connected.Common.Numbering.Model\Connected.Common.Numbering.Model.csproj" />
   </ItemGroup>
 
diff --git a/Connected.Common.Numbering.Middleware/INumberingProvider.cs b/src/Connected.Common.Numbering.Middleware/INumberingProvider.cs
similarity index 100%
rename from Connected.Common.Numbering.Middleware/INumberingProvider.cs
rename to src/Connected.Common.Numbering.Middleware/INumberingProvider.cs
diff --git a/Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj b/src/Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj
similarity index 77%
rename from Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj
rename to src/Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj
index 3f2260a..2959416 100644
--- a/Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj
+++ b/src/Connected.Common.Numbering.Model/Connected.Common.Numbering.Model.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.Common.Numbering.Model/INumbering.cs b/src/Connected.Common.Numbering.Model/INumbering.cs
similarity index 100%
rename from Connected.Common.Numbering.Model/INumbering.cs
rename to src/Connected.Common.Numbering.Model/INumbering.cs
diff --git a/Connected.Common.Numbering.Model/INumberingService.cs b/src/Connected.Common.Numbering.Model/INumberingService.cs
similarity index 100%
rename from Connected.Common.Numbering.Model/INumberingService.cs
rename to src/Connected.Common.Numbering.Model/INumberingService.cs
diff --git a/Connected.Common.Numbering.Model/NumberingArgs.cs b/src/Connected.Common.Numbering.Model/NumberingArgs.cs
similarity index 100%
rename from Connected.Common.Numbering.Model/NumberingArgs.cs
rename to src/Connected.Common.Numbering.Model/NumberingArgs.cs
diff --git a/Connected.Common.Numbering.Model/NumberingUrls.cs b/src/Connected.Common.Numbering.Model/NumberingUrls.cs
similarity index 100%
rename from Connected.Common.Numbering.Model/NumberingUrls.cs
rename to src/Connected.Common.Numbering.Model/NumberingUrls.cs
diff --git a/Connected.Common.Numbering/Connected.Common.Numbering.csproj b/src/Connected.Common.Numbering/Connected.Common.Numbering.csproj
similarity index 82%
rename from Connected.Common.Numbering/Connected.Common.Numbering.csproj
rename to src/Connected.Common.Numbering/Connected.Common.Numbering.csproj
index 0a2302d..e678310 100644
--- a/Connected.Common.Numbering/Connected.Common.Numbering.csproj
+++ b/src/Connected.Common.Numbering/Connected.Common.Numbering.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
     <ProjectReference Include="..\Connected.Common.Numbering.Middleware\Connected.Common.Numbering.Middleware.csproj" />
     <ProjectReference Include="..\Connected.Common.Numbering.Model\Connected.Common.Numbering.Model.csproj" />
     <ProjectReference Include="..\Connected.Common\Connected.Common.csproj" />
diff --git a/Connected.Common.Numbering/DefaultProvider.cs b/src/Connected.Common.Numbering/DefaultProvider.cs
similarity index 100%
rename from Connected.Common.Numbering/DefaultProvider.cs
rename to src/Connected.Common.Numbering/DefaultProvider.cs
diff --git a/Connected.Common.Numbering/Numbering.cs b/src/Connected.Common.Numbering/Numbering.cs
similarity index 100%
rename from Connected.Common.Numbering/Numbering.cs
rename to src/Connected.Common.Numbering/Numbering.cs
diff --git a/Connected.Common.Numbering/NumberingOps.cs b/src/Connected.Common.Numbering/NumberingOps.cs
similarity index 100%
rename from Connected.Common.Numbering/NumberingOps.cs
rename to src/Connected.Common.Numbering/NumberingOps.cs
diff --git a/Connected.Common.Numbering/NumberingService.cs b/src/Connected.Common.Numbering/NumberingService.cs
similarity index 100%
rename from Connected.Common.Numbering/NumberingService.cs
rename to src/Connected.Common.Numbering/NumberingService.cs
diff --git a/Connected.Common/Collections/MessageJob.cs b/src/Connected.Common/Collections/MessageJob.cs
similarity index 100%
rename from Connected.Common/Collections/MessageJob.cs
rename to src/Connected.Common/Collections/MessageJob.cs
diff --git a/Connected.Common/Collections/QueueCache.cs b/src/Connected.Common/Collections/QueueCache.cs
similarity index 100%
rename from Connected.Common/Collections/QueueCache.cs
rename to src/Connected.Common/Collections/QueueCache.cs
diff --git a/Connected.Common/Collections/QueueClientService.cs b/src/Connected.Common/Collections/QueueClientService.cs
similarity index 100%
rename from Connected.Common/Collections/QueueClientService.cs
rename to src/Connected.Common/Collections/QueueClientService.cs
diff --git a/Connected.Common/Collections/QueueMessage.cs b/src/Connected.Common/Collections/QueueMessage.cs
similarity index 100%
rename from Connected.Common/Collections/QueueMessage.cs
rename to src/Connected.Common/Collections/QueueMessage.cs
diff --git a/Connected.Common/Collections/QueueMessageDispatcher.cs b/src/Connected.Common/Collections/QueueMessageDispatcher.cs
similarity index 100%
rename from Connected.Common/Collections/QueueMessageDispatcher.cs
rename to src/Connected.Common/Collections/QueueMessageDispatcher.cs
diff --git a/Connected.Common/Collections/QueueOps.cs b/src/Connected.Common/Collections/QueueOps.cs
similarity index 100%
rename from Connected.Common/Collections/QueueOps.cs
rename to src/Connected.Common/Collections/QueueOps.cs
diff --git a/Connected.Common/Collections/QueueService.cs b/src/Connected.Common/Collections/QueueService.cs
similarity index 100%
rename from Connected.Common/Collections/QueueService.cs
rename to src/Connected.Common/Collections/QueueService.cs
diff --git a/Connected.Common/CommonSchemas.cs b/src/Connected.Common/CommonSchemas.cs
similarity index 100%
rename from Connected.Common/CommonSchemas.cs
rename to src/Connected.Common/CommonSchemas.cs
diff --git a/Connected.Common/CommonStartup.cs b/src/Connected.Common/CommonStartup.cs
similarity index 100%
rename from Connected.Common/CommonStartup.cs
rename to src/Connected.Common/CommonStartup.cs
diff --git a/Connected.Common/Connected.Common.csproj b/src/Connected.Common/Connected.Common.csproj
similarity index 54%
rename from Connected.Common/Connected.Common.csproj
rename to src/Connected.Common/Connected.Common.csproj
index d5445fc..b21e779 100644
--- a/Connected.Common/Connected.Common.csproj
+++ b/src/Connected.Common/Connected.Common.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
-    <ProjectReference Include="..\..\connected.framework.serviceModel\Connected.ServiceModel\Connected.ServiceModel.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Globalization\Connected.Globalization.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Net\Connected.Net.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Services\Connected.Services.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Validation\Connected.Validation.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework.serviceModel\src\Connected.ServiceModel\Connected.ServiceModel.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Globalization\Connected.Globalization.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Net\Connected.Net.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Validation\Connected.Validation.csproj" />
     <ProjectReference Include="..\Connected.Common.Model\Connected.Common.Model.csproj" />
   </ItemGroup>
 
diff --git a/Connected.Common/Definitions.cs b/src/Connected.Common/Definitions.cs
similarity index 100%
rename from Connected.Common/Definitions.cs
rename to src/Connected.Common/Definitions.cs
diff --git a/Connected.Common/Distributed/DistributedLock.cs b/src/Connected.Common/Distributed/DistributedLock.cs
similarity index 100%
rename from Connected.Common/Distributed/DistributedLock.cs
rename to src/Connected.Common/Distributed/DistributedLock.cs
diff --git a/Connected.Common/Distributed/DistributedLockArgs.cs b/src/Connected.Common/Distributed/DistributedLockArgs.cs
similarity index 100%
rename from Connected.Common/Distributed/DistributedLockArgs.cs
rename to src/Connected.Common/Distributed/DistributedLockArgs.cs
diff --git a/Connected.Common/Distributed/DistributedLockOps.cs b/src/Connected.Common/Distributed/DistributedLockOps.cs
similarity index 100%
rename from Connected.Common/Distributed/DistributedLockOps.cs
rename to src/Connected.Common/Distributed/DistributedLockOps.cs
diff --git a/Connected.Common/Distributed/DistributedLockProtector.cs b/src/Connected.Common/Distributed/DistributedLockProtector.cs
similarity index 100%
rename from Connected.Common/Distributed/DistributedLockProtector.cs
rename to src/Connected.Common/Distributed/DistributedLockProtector.cs
diff --git a/Connected.Common/Distributed/DistributedLockService.cs b/src/Connected.Common/Distributed/DistributedLockService.cs
similarity index 100%
rename from Connected.Common/Distributed/DistributedLockService.cs
rename to src/Connected.Common/Distributed/DistributedLockService.cs
diff --git a/Connected.Common/Distributed/IDistributedLock.cs b/src/Connected.Common/Distributed/IDistributedLock.cs
similarity index 100%
rename from Connected.Common/Distributed/IDistributedLock.cs
rename to src/Connected.Common/Distributed/IDistributedLock.cs
diff --git a/Connected.Common/Distributed/IDistributedLockService.cs b/src/Connected.Common/Distributed/IDistributedLockService.cs
similarity index 100%
rename from Connected.Common/Distributed/IDistributedLockService.cs
rename to src/Connected.Common/Distributed/IDistributedLockService.cs
diff --git a/Connected.Common/Documents/Document.cs b/src/Connected.Common/Documents/Document.cs
similarity index 100%
rename from Connected.Common/Documents/Document.cs
rename to src/Connected.Common/Documents/Document.cs
diff --git a/Connected.Common/Documents/DocumentListener.cs b/src/Connected.Common/Documents/DocumentListener.cs
similarity index 100%
rename from Connected.Common/Documents/DocumentListener.cs
rename to src/Connected.Common/Documents/DocumentListener.cs
diff --git a/Connected.Common/Documents/DocumentLocker.cs b/src/Connected.Common/Documents/DocumentLocker.cs
similarity index 100%
rename from Connected.Common/Documents/DocumentLocker.cs
rename to src/Connected.Common/Documents/DocumentLocker.cs
diff --git a/Connected.Common/Documents/DocumentService.cs b/src/Connected.Common/Documents/DocumentService.cs
similarity index 100%
rename from Connected.Common/Documents/DocumentService.cs
rename to src/Connected.Common/Documents/DocumentService.cs
diff --git a/Connected.Common/Documents/IDocumentLocker.cs b/src/Connected.Common/Documents/IDocumentLocker.cs
similarity index 100%
rename from Connected.Common/Documents/IDocumentLocker.cs
rename to src/Connected.Common/Documents/IDocumentLocker.cs
diff --git a/Connected.Common/Documents/Validators.cs b/src/Connected.Common/Documents/Validators.cs
similarity index 100%
rename from Connected.Common/Documents/Validators.cs
rename to src/Connected.Common/Documents/Validators.cs
diff --git a/Connected.Common/Globalization/GlobalizationService.cs b/src/Connected.Common/Globalization/GlobalizationService.cs
similarity index 100%
rename from Connected.Common/Globalization/GlobalizationService.cs
rename to src/Connected.Common/Globalization/GlobalizationService.cs
diff --git a/Connected.Common/Globalization/Language.cs b/src/Connected.Common/Globalization/Language.cs
similarity index 100%
rename from Connected.Common/Globalization/Language.cs
rename to src/Connected.Common/Globalization/Language.cs
diff --git a/Connected.Common/Globalization/LanguageCache.cs b/src/Connected.Common/Globalization/LanguageCache.cs
similarity index 100%
rename from Connected.Common/Globalization/LanguageCache.cs
rename to src/Connected.Common/Globalization/LanguageCache.cs
diff --git a/Connected.Common/Globalization/LanguageOps.cs b/src/Connected.Common/Globalization/LanguageOps.cs
similarity index 100%
rename from Connected.Common/Globalization/LanguageOps.cs
rename to src/Connected.Common/Globalization/LanguageOps.cs
diff --git a/Connected.Common/Globalization/LanguageService.cs b/src/Connected.Common/Globalization/LanguageService.cs
similarity index 100%
rename from Connected.Common/Globalization/LanguageService.cs
rename to src/Connected.Common/Globalization/LanguageService.cs
diff --git a/Connected.Common/Net/Endpoint.cs b/src/Connected.Common/Net/Endpoint.cs
similarity index 100%
rename from Connected.Common/Net/Endpoint.cs
rename to src/Connected.Common/Net/Endpoint.cs
diff --git a/Connected.Common/Net/EndpointCache.cs b/src/Connected.Common/Net/EndpointCache.cs
similarity index 100%
rename from Connected.Common/Net/EndpointCache.cs
rename to src/Connected.Common/Net/EndpointCache.cs
diff --git a/Connected.Common/Net/EndpointOps.cs b/src/Connected.Common/Net/EndpointOps.cs
similarity index 100%
rename from Connected.Common/Net/EndpointOps.cs
rename to src/Connected.Common/Net/EndpointOps.cs
diff --git a/Connected.Common/Net/EndpointService.cs b/src/Connected.Common/Net/EndpointService.cs
similarity index 100%
rename from Connected.Common/Net/EndpointService.cs
rename to src/Connected.Common/Net/EndpointService.cs
diff --git a/Connected.Common/SR.Designer.cs b/src/Connected.Common/SR.Designer.cs
similarity index 100%
rename from Connected.Common/SR.Designer.cs
rename to src/Connected.Common/SR.Designer.cs
diff --git a/Connected.Common/SR.resx b/src/Connected.Common/SR.resx
similarity index 100%
rename from Connected.Common/SR.resx
rename to src/Connected.Common/SR.resx
diff --git a/Connected.Common/Security/CommonClaims.cs b/src/Connected.Common/Security/CommonClaims.cs
similarity index 100%
rename from Connected.Common/Security/CommonClaims.cs
rename to src/Connected.Common/Security/CommonClaims.cs
diff --git a/Connected.Common/Security/Identity/IdentityService.cs b/src/Connected.Common/Security/Identity/IdentityService.cs
similarity index 100%
rename from Connected.Common/Security/Identity/IdentityService.cs
rename to src/Connected.Common/Security/Identity/IdentityService.cs
diff --git a/Connected.Common/Security/Identity/Role.cs b/src/Connected.Common/Security/Identity/Role.cs
similarity index 100%
rename from Connected.Common/Security/Identity/Role.cs
rename to src/Connected.Common/Security/Identity/Role.cs
diff --git a/Connected.Common/Security/Identity/RoleCache.cs b/src/Connected.Common/Security/Identity/RoleCache.cs
similarity index 100%
rename from Connected.Common/Security/Identity/RoleCache.cs
rename to src/Connected.Common/Security/Identity/RoleCache.cs
diff --git a/Connected.Common/Security/Identity/RoleOps.cs b/src/Connected.Common/Security/Identity/RoleOps.cs
similarity index 100%
rename from Connected.Common/Security/Identity/RoleOps.cs
rename to src/Connected.Common/Security/Identity/RoleOps.cs
diff --git a/Connected.Common/Security/Identity/RoleService.cs b/src/Connected.Common/Security/Identity/RoleService.cs
similarity index 100%
rename from Connected.Common/Security/Identity/RoleService.cs
rename to src/Connected.Common/Security/Identity/RoleService.cs
diff --git a/Connected.Common/Security/Identity/User.cs b/src/Connected.Common/Security/Identity/User.cs
similarity index 100%
rename from Connected.Common/Security/Identity/User.cs
rename to src/Connected.Common/Security/Identity/User.cs
diff --git a/Connected.Common/Security/Identity/UserCache.cs b/src/Connected.Common/Security/Identity/UserCache.cs
similarity index 100%
rename from Connected.Common/Security/Identity/UserCache.cs
rename to src/Connected.Common/Security/Identity/UserCache.cs
diff --git a/Connected.Common/Security/Identity/UserOps.cs b/src/Connected.Common/Security/Identity/UserOps.cs
similarity index 100%
rename from Connected.Common/Security/Identity/UserOps.cs
rename to src/Connected.Common/Security/Identity/UserOps.cs
diff --git a/Connected.Common/Security/Identity/UserService.cs b/src/Connected.Common/Security/Identity/UserService.cs
similarity index 100%
rename from Connected.Common/Security/Identity/UserService.cs
rename to src/Connected.Common/Security/Identity/UserService.cs
diff --git a/Connected.Common/Security/Membership/Membership.cs b/src/Connected.Common/Security/Membership/Membership.cs
similarity index 100%
rename from Connected.Common/Security/Membership/Membership.cs
rename to src/Connected.Common/Security/Membership/Membership.cs
diff --git a/Connected.Common/Security/Membership/MembershipCache.cs b/src/Connected.Common/Security/Membership/MembershipCache.cs
similarity index 100%
rename from Connected.Common/Security/Membership/MembershipCache.cs
rename to src/Connected.Common/Security/Membership/MembershipCache.cs
diff --git a/Connected.Common/Security/Membership/MembershipOps.cs b/src/Connected.Common/Security/Membership/MembershipOps.cs
similarity index 100%
rename from Connected.Common/Security/Membership/MembershipOps.cs
rename to src/Connected.Common/Security/Membership/MembershipOps.cs
diff --git a/Connected.Common/Security/Membership/MembershipService.cs b/src/Connected.Common/Security/Membership/MembershipService.cs
similarity index 100%
rename from Connected.Common/Security/Membership/MembershipService.cs
rename to src/Connected.Common/Security/Membership/MembershipService.cs
diff --git a/Connected.Common/Security/Permissions/Permission.cs b/src/Connected.Common/Security/Permissions/Permission.cs
similarity index 100%
rename from Connected.Common/Security/Permissions/Permission.cs
rename to src/Connected.Common/Security/Permissions/Permission.cs
diff --git a/Connected.Common/Security/Permissions/PermissionCache.cs b/src/Connected.Common/Security/Permissions/PermissionCache.cs
similarity index 100%
rename from Connected.Common/Security/Permissions/PermissionCache.cs
rename to src/Connected.Common/Security/Permissions/PermissionCache.cs
diff --git a/Connected.Common/Security/Permissions/PermissionOps.cs b/src/Connected.Common/Security/Permissions/PermissionOps.cs
similarity index 100%
rename from Connected.Common/Security/Permissions/PermissionOps.cs
rename to src/Connected.Common/Security/Permissions/PermissionOps.cs
diff --git a/Connected.Common/Security/Permissions/PermissionService.cs b/src/Connected.Common/Security/Permissions/PermissionService.cs
similarity index 100%
rename from Connected.Common/Security/Permissions/PermissionService.cs
rename to src/Connected.Common/Security/Permissions/PermissionService.cs
diff --git a/Connected.Common/Settings/SettingsService.cs b/src/Connected.Common/Settings/SettingsService.cs
similarity index 100%
rename from Connected.Common/Settings/SettingsService.cs
rename to src/Connected.Common/Settings/SettingsService.cs