diff --git a/Framework.ServiceModel.sln b/Framework.ServiceModel.sln
index 48985b8..f9048cc 100644
--- a/Framework.ServiceModel.sln
+++ b/Framework.ServiceModel.sln
@@ -5,13 +5,13 @@ VisualStudioVersion = 17.4.33027.239
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{6EFC1819-8C82-49C6-B893-B84E8C218560}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{6F70D808-2CB4-4844-B72C-BE01E91C7861}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{6F70D808-2CB4-4844-B72C-BE01E91C7861}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{2157CA78-5896-423A-821C-C322814FE3F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{2157CA78-5896-423A-821C-C322814FE3F8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\Connected.Runtime\Connected.Runtime.csproj", "{0CE8C487-CE51-40EA-9525-9673277818C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj", "{0CE8C487-CE51-40EA-9525-9673277818C1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.ServiceModel/Annotations/PartitionKeyAttribute.cs b/src/Connected.ServiceModel/Annotations/PartitionKeyAttribute.cs
similarity index 100%
rename from Connected.ServiceModel/Annotations/PartitionKeyAttribute.cs
rename to src/Connected.ServiceModel/Annotations/PartitionKeyAttribute.cs
diff --git a/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
similarity index 55%
rename from Connected.ServiceModel/Connected.ServiceModel.csproj
rename to src/Connected.ServiceModel/Connected.ServiceModel.csproj
index ea160fb..02f6d85 100644
--- a/Connected.ServiceModel/Connected.ServiceModel.csproj
+++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework\Connected.Entities\Connected.Entities.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Runtime\Connected.Runtime.csproj" />
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.ServiceModel/Data/ITableEntity.cs b/src/Connected.ServiceModel/Data/ITableEntity.cs
similarity index 100%
rename from Connected.ServiceModel/Data/ITableEntity.cs
rename to src/Connected.ServiceModel/Data/ITableEntity.cs
diff --git a/Connected.ServiceModel/Data/ITableService.cs b/src/Connected.ServiceModel/Data/ITableService.cs
similarity index 100%
rename from Connected.ServiceModel/Data/ITableService.cs
rename to src/Connected.ServiceModel/Data/ITableService.cs
diff --git a/Connected.ServiceModel/Data/TableEntity.cs b/src/Connected.ServiceModel/Data/TableEntity.cs
similarity index 100%
rename from Connected.ServiceModel/Data/TableEntity.cs
rename to src/Connected.ServiceModel/Data/TableEntity.cs
diff --git a/Connected.ServiceModel/Search/ISearchEntity.cs b/src/Connected.ServiceModel/Search/ISearchEntity.cs
similarity index 100%
rename from Connected.ServiceModel/Search/ISearchEntity.cs
rename to src/Connected.ServiceModel/Search/ISearchEntity.cs
diff --git a/Connected.ServiceModel/Search/ISearchService.cs b/src/Connected.ServiceModel/Search/ISearchService.cs
similarity index 100%
rename from Connected.ServiceModel/Search/ISearchService.cs
rename to src/Connected.ServiceModel/Search/ISearchService.cs
diff --git a/Connected.ServiceModel/Search/SearchEntity.cs b/src/Connected.ServiceModel/Search/SearchEntity.cs
similarity index 100%
rename from Connected.ServiceModel/Search/SearchEntity.cs
rename to src/Connected.ServiceModel/Search/SearchEntity.cs
diff --git a/Connected.ServiceModel/Search/SearchExtensions.cs b/src/Connected.ServiceModel/Search/SearchExtensions.cs
similarity index 100%
rename from Connected.ServiceModel/Search/SearchExtensions.cs
rename to src/Connected.ServiceModel/Search/SearchExtensions.cs
diff --git a/Connected.ServiceModel/ServiceArgs.cs b/src/Connected.ServiceModel/ServiceArgs.cs
similarity index 100%
rename from Connected.ServiceModel/ServiceArgs.cs
rename to src/Connected.ServiceModel/ServiceArgs.cs
diff --git a/Connected.ServiceModel/ServiceModelStartup.cs b/src/Connected.ServiceModel/ServiceModelStartup.cs
similarity index 100%
rename from Connected.ServiceModel/ServiceModelStartup.cs
rename to src/Connected.ServiceModel/ServiceModelStartup.cs
diff --git a/Connected.ServiceModel/Storage/IDirectory.cs b/src/Connected.ServiceModel/Storage/IDirectory.cs
similarity index 100%
rename from Connected.ServiceModel/Storage/IDirectory.cs
rename to src/Connected.ServiceModel/Storage/IDirectory.cs
diff --git a/Connected.ServiceModel/Storage/IFile.cs b/src/Connected.ServiceModel/Storage/IFile.cs
similarity index 100%
rename from Connected.ServiceModel/Storage/IFile.cs
rename to src/Connected.ServiceModel/Storage/IFile.cs
diff --git a/Connected.ServiceModel/Storage/IStorageService.cs b/src/Connected.ServiceModel/Storage/IStorageService.cs
similarity index 100%
rename from Connected.ServiceModel/Storage/IStorageService.cs
rename to src/Connected.ServiceModel/Storage/IStorageService.cs
diff --git a/Connected.ServiceModel/Storage/StorageArgs.cs b/src/Connected.ServiceModel/Storage/StorageArgs.cs
similarity index 100%
rename from Connected.ServiceModel/Storage/StorageArgs.cs
rename to src/Connected.ServiceModel/Storage/StorageArgs.cs