diff --git a/Connected.Customers.sln b/Connected.Customers.sln
index 52434ea..2149a6f 100644
--- a/Connected.Customers.sln
+++ b/Connected.Customers.sln
@@ -5,15 +5,15 @@ VisualStudioVersion = 17.4.33020.496
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{AE326167-90A7-4D49-BB24-BA7DEE6A2F26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "..\Connected.Common.Types\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{3839CE71-C1DD-467E-B1E4-8D00C3460CC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "..\Connected.Common.Types\src\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{3839CE71-C1DD-467E-B1E4-8D00C3460CC5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types.Model", "Connected.Contacts.Types.Model\Connected.Contacts.Types.Model.csproj", "{AA722E99-87C8-4D8F-ACB5-2F2D07669BC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types.Model", "src\Connected.Contacts.Types.Model\Connected.Contacts.Types.Model.csproj", "{AA722E99-87C8-4D8F-ACB5-2F2D07669BC6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types", "Connected.Contacts.Types\Connected.Contacts.Types.csproj", "{D465F1C6-42CE-445A-9CCE-5DD6D8A30055}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Contacts.Types", "src\Connected.Contacts.Types\Connected.Contacts.Types.csproj", "{D465F1C6-42CE-445A-9CCE-5DD6D8A30055}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{B805B1E7-EDD1-423E-8F80-94DC415FBA70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{B805B1E7-EDD1-423E-8F80-94DC415FBA70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{CC29CC2B-D171-4914-8ED6-325BB4E546D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\src\Connected.Services\Connected.Services.csproj", "{CC29CC2B-D171-4914-8ED6-325BB4E546D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Connected.Contacts.Types.Model/Addresses/IAddress.cs b/src/Connected.Contacts.Types.Model/Addresses/IAddress.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/Addresses/IAddress.cs
rename to src/Connected.Contacts.Types.Model/Addresses/IAddress.cs
diff --git a/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj b/src/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj
similarity index 68%
rename from Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj
rename to src/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj
index f23c49c..aed93fa 100644
--- a/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj
+++ b/src/Connected.Contacts.Types.Model/Connected.Contacts.Types.Model.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected.Common.Types\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
+    <ProjectReference Include="..\..\..\Connected.Common.Types\src\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.Contacts.Types.Model/ContactsUrls.cs b/src/Connected.Contacts.Types.Model/ContactsUrls.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/ContactsUrls.cs
rename to src/Connected.Contacts.Types.Model/ContactsUrls.cs
diff --git a/Connected.Contacts.Types.Model/IBusinessPartner.cs b/src/Connected.Contacts.Types.Model/IBusinessPartner.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/IBusinessPartner.cs
rename to src/Connected.Contacts.Types.Model/IBusinessPartner.cs
diff --git a/Connected.Contacts.Types.Model/IBusinessPartnerService.cs b/src/Connected.Contacts.Types.Model/IBusinessPartnerService.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/IBusinessPartnerService.cs
rename to src/Connected.Contacts.Types.Model/IBusinessPartnerService.cs
diff --git a/Connected.Contacts.Types.Model/IContact.cs b/src/Connected.Contacts.Types.Model/IContact.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/IContact.cs
rename to src/Connected.Contacts.Types.Model/IContact.cs
diff --git a/Connected.Contacts.Types.Model/Organizations/IOrganization.cs b/src/Connected.Contacts.Types.Model/Organizations/IOrganization.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/Organizations/IOrganization.cs
rename to src/Connected.Contacts.Types.Model/Organizations/IOrganization.cs
diff --git a/Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs b/src/Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs
similarity index 100%
rename from Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs
rename to src/Connected.Contacts.Types.Model/Organizations/IOrganizationContact.cs
diff --git a/Connected.Contacts.Types/Bootstrapper.cs b/src/Connected.Contacts.Types/Bootstrapper.cs
similarity index 100%
rename from Connected.Contacts.Types/Bootstrapper.cs
rename to src/Connected.Contacts.Types/Bootstrapper.cs
diff --git a/Connected.Contacts.Types/BusinessPartnerService.cs b/src/Connected.Contacts.Types/BusinessPartnerService.cs
similarity index 100%
rename from Connected.Contacts.Types/BusinessPartnerService.cs
rename to src/Connected.Contacts.Types/BusinessPartnerService.cs
diff --git a/Connected.Contacts.Types/Connected.Contacts.Types.csproj b/src/Connected.Contacts.Types/Connected.Contacts.Types.csproj
similarity index 60%
rename from Connected.Contacts.Types/Connected.Contacts.Types.csproj
rename to src/Connected.Contacts.Types/Connected.Contacts.Types.csproj
index 4e74970..a3110ae 100644
--- a/Connected.Contacts.Types/Connected.Contacts.Types.csproj
+++ b/src/Connected.Contacts.Types/Connected.Contacts.Types.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework\Connected.Entities\Connected.Entities.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
     <ProjectReference Include="..\Connected.Contacts.Types.Model\Connected.Contacts.Types.Model.csproj" />
   </ItemGroup>