diff --git a/Connected.Common.Types.sln b/Connected.Common.Types.sln
index 89101b1..206245c 100644
--- a/Connected.Common.Types.sln
+++ b/Connected.Common.Types.sln
@@ -5,37 +5,39 @@ VisualStudioVersion = 17.4.32916.344
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{20087506-E20F-4FD6-ADFB-9D7ADBBD3998}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Client", "Connected.Common.Types.Client\Connected.Common.Types.Client.csproj", "{B94A8E27-3682-4321-9BF7-F0A2D775E905}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Client", "src\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj", "{B94A8E27-3682-4321-9BF7-F0A2D775E905}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Middleware", "Connected.Common.Types.Middleware\Connected.Common.Types.Middleware.csproj", "{72B591CC-DAC3-4F9A-A95C-67C265FB4E93}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Middleware", "src\Connected.Common.Types.Middleware\Connected.Common.Types.Middleware.csproj", "{72B591CC-DAC3-4F9A-A95C-67C265FB4E93}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types", "Connected.Common.Types\Connected.Common.Types.csproj", "{EDDF95B7-236C-4F87-A9F0-1BC5A7FA9980}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types", "src\Connected.Common.Types\Connected.Common.Types.csproj", "{EDDF95B7-236C-4F87-A9F0-1BC5A7FA9980}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.UI", "Connected.Common.Types.UI\Connected.Common.Types.UI.csproj", "{62A9D5D4-942B-40DA-AA9C-CF3D48339B60}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.UI", "src\Connected.Common.Types.UI\Connected.Common.Types.UI.csproj", "{62A9D5D4-942B-40DA-AA9C-CF3D48339B60}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\Connected\Connected.csproj", "{B19801B5-7C84-4669-92AF-7581ABBDE259}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{B19801B5-7C84-4669-92AF-7581ABBDE259}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\Connected.Client\Connected.Client.csproj", "{EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "..\Connected\src\Connected.Client\Connected.Client.csproj", "{EA8DA8CF-9DE4-4815-93C3-ED92A6B5E64D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{DB82BD88-23C1-4E8A-9E48-92848E1942C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Model", "src\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj", "{DB82BD88-23C1-4E8A-9E48-92848E1942C0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Tests", "Connected.Common.Types.Tests\Connected.Common.Types.Tests.csproj", "{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "..\connected.common\src\Connected.Common.Model\Connected.Common.Model.csproj", "{51A89A04-8FA6-498C-966D-67D09840A22F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "..\connected.common\Connected.Common.Model\Connected.Common.Model.csproj", "{51A89A04-8FA6-498C-966D-67D09840A22F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\src\Connected.Data\Connected.Data.csproj", "{D803081E-5C23-437D-AB90-A40FE6572804}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\Connected.Data\Connected.Data.csproj", "{D803081E-5C23-437D-AB90-A40FE6572804}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{B026AF4F-106D-4198-A9F5-AEE456970877}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\Connected.Entities\Connected.Entities.csproj", "{B026AF4F-106D-4198-A9F5-AEE456970877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\connected.framework\src\Connected.Middleware\Connected.Middleware.csproj", "{D35000E2-AB75-42B7-B270-63804CB999A0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "..\connected.framework\Connected.Middleware\Connected.Middleware.csproj", "{D35000E2-AB75-42B7-B270-63804CB999A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj", "{00737C68-21CC-4FD0-9D29-965386AC16D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\Connected.Runtime\Connected.Runtime.csproj", "{00737C68-21CC-4FD0-9D29-965386AC16D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\src\Connected.Services\Connected.Services.csproj", "{14DB124B-AE34-4D92-A734-EA18103EF96C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\Connected.Services\Connected.Services.csproj", "{14DB124B-AE34-4D92-A734-EA18103EF96C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\src\Connected.Components\Connected.Components.csproj", "{8FB259E5-77B8-4357-831C-C381EA26E2A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\Connected.Components\Connected.Components.csproj", "{8FB259E5-77B8-4357-831C-C381EA26E2A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\src\Connected.UI\Connected.UI.csproj", "{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\Connected.UI\Connected.UI.csproj", "{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D1988217-0AF1-4A13-94AA-FF55337383D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Tests", "tests\Connected.Common.Types.Tests\Connected.Common.Types.Tests.csproj", "{B1C41076-5120-47DA-AEE7-D90E0EB7C038}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,10 +73,6 @@ Global
 		{DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB82BD88-23C1-4E8A-9E48-92848E1942C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEF4D71A-C334-4E13-AECD-8EEA06872BB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{51A89A04-8FA6-498C-966D-67D09840A22F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{51A89A04-8FA6-498C-966D-67D09840A22F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51A89A04-8FA6-498C-966D-67D09840A22F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -103,10 +101,14 @@ Global
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -121,7 +123,8 @@ Global
 		{00737C68-21CC-4FD0-9D29-965386AC16D6} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
 		{14DB124B-AE34-4D92-A734-EA18103EF96C} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
-		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
+		{128E43DF-64A7-4A3E-A4CD-5B261EAD75C1} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
+		{B1C41076-5120-47DA-AEE7-D90E0EB7C038} = {D1988217-0AF1-4A13-94AA-FF55337383D0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C661325-1729-4560-89F9-E2B51B111B72}
diff --git a/Connected.Common.Types.Client/ClientBootstrapper.cs b/src/Connected.Common.Types.Client/ClientBootstrapper.cs
similarity index 100%
rename from Connected.Common.Types.Client/ClientBootstrapper.cs
rename to src/Connected.Common.Types.Client/ClientBootstrapper.cs
diff --git a/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj b/src/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj
similarity index 80%
rename from Connected.Common.Types.Client/Connected.Common.Types.Client.csproj
rename to src/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj
index 7a95249..b3a7b53 100644
--- a/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj
+++ b/src/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Connected\Connected.Client\Connected.Client.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected.Client\Connected.Client.csproj" />
     <ProjectReference Include="..\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
   </ItemGroup>
 
diff --git a/Connected.Common.Types.Client/TaxRates/TaxRate.cs b/src/Connected.Common.Types.Client/TaxRates/TaxRate.cs
similarity index 100%
rename from Connected.Common.Types.Client/TaxRates/TaxRate.cs
rename to src/Connected.Common.Types.Client/TaxRates/TaxRate.cs
diff --git a/Connected.Common.Types.Client/TaxRates/TaxRateService.cs b/src/Connected.Common.Types.Client/TaxRates/TaxRateService.cs
similarity index 100%
rename from Connected.Common.Types.Client/TaxRates/TaxRateService.cs
rename to src/Connected.Common.Types.Client/TaxRates/TaxRateService.cs
diff --git a/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj b/src/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj
similarity index 77%
rename from Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj
rename to src/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj
index a19448b..c7a52f0 100644
--- a/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj
+++ b/src/Connected.Common.Types.Middleware/Connected.Common.Types.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.Types.Model\Connected.Common.Types.Model.csproj" />
   </ItemGroup>
 
diff --git a/Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs b/src/Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs
similarity index 100%
rename from Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs
rename to src/Connected.Common.Types.Middleware/Currencies/ICurrencyFormatterMiddleware.cs
diff --git a/Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs b/src/Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs
rename to src/Connected.Common.Types.Model/BankAccounts/BankAccountArgs.cs
diff --git a/Connected.Common.Types.Model/BankAccounts/IBankAccount.cs b/src/Connected.Common.Types.Model/BankAccounts/IBankAccount.cs
similarity index 100%
rename from Connected.Common.Types.Model/BankAccounts/IBankAccount.cs
rename to src/Connected.Common.Types.Model/BankAccounts/IBankAccount.cs
diff --git a/Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs b/src/Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs
similarity index 100%
rename from Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs
rename to src/Connected.Common.Types.Model/BankAccounts/IBankAccountService.cs
diff --git a/Connected.Common.Types.Model/Banks/BankArgs.cs b/src/Connected.Common.Types.Model/Banks/BankArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/Banks/BankArgs.cs
rename to src/Connected.Common.Types.Model/Banks/BankArgs.cs
diff --git a/Connected.Common.Types.Model/Banks/IBank.cs b/src/Connected.Common.Types.Model/Banks/IBank.cs
similarity index 100%
rename from Connected.Common.Types.Model/Banks/IBank.cs
rename to src/Connected.Common.Types.Model/Banks/IBank.cs
diff --git a/Connected.Common.Types.Model/Banks/IBankService.cs b/src/Connected.Common.Types.Model/Banks/IBankService.cs
similarity index 100%
rename from Connected.Common.Types.Model/Banks/IBankService.cs
rename to src/Connected.Common.Types.Model/Banks/IBankService.cs
diff --git a/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj b/src/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj
similarity index 59%
rename from Connected.Common.Types.Model/Connected.Common.Types.Model.csproj
rename to src/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj
index 3ed87a3..dbcbf8f 100644
--- a/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj
+++ b/src/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.common\Connected.Common.Model\Connected.Common.Model.csproj" />
-    <ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+    <ProjectReference Include="..\..\..\connected.common\src\Connected.Common.Model\Connected.Common.Model.csproj" />
+    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.Common.Types.Model/Continent/ContinentArgs.cs b/src/Connected.Common.Types.Model/Continent/ContinentArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/ContinentArgs.cs
rename to src/Connected.Common.Types.Model/Continent/ContinentArgs.cs
diff --git a/Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs b/src/Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs
rename to src/Connected.Common.Types.Model/Continent/Countries/ContinentCountryArgs.cs
diff --git a/Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs b/src/Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs
rename to src/Connected.Common.Types.Model/Continent/Countries/IContinentCountry.cs
diff --git a/Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs b/src/Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs
rename to src/Connected.Common.Types.Model/Continent/Countries/IContinentCountryService.cs
diff --git a/Connected.Common.Types.Model/Continent/IContinent.cs b/src/Connected.Common.Types.Model/Continent/IContinent.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/IContinent.cs
rename to src/Connected.Common.Types.Model/Continent/IContinent.cs
diff --git a/Connected.Common.Types.Model/Continent/IContinentService.cs b/src/Connected.Common.Types.Model/Continent/IContinentService.cs
similarity index 100%
rename from Connected.Common.Types.Model/Continent/IContinentService.cs
rename to src/Connected.Common.Types.Model/Continent/IContinentService.cs
diff --git a/Connected.Common.Types.Model/Countries/CountryArgs.cs b/src/Connected.Common.Types.Model/Countries/CountryArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/Countries/CountryArgs.cs
rename to src/Connected.Common.Types.Model/Countries/CountryArgs.cs
diff --git a/Connected.Common.Types.Model/Countries/ICountry.cs b/src/Connected.Common.Types.Model/Countries/ICountry.cs
similarity index 100%
rename from Connected.Common.Types.Model/Countries/ICountry.cs
rename to src/Connected.Common.Types.Model/Countries/ICountry.cs
diff --git a/Connected.Common.Types.Model/Countries/ICountryService.cs b/src/Connected.Common.Types.Model/Countries/ICountryService.cs
similarity index 100%
rename from Connected.Common.Types.Model/Countries/ICountryService.cs
rename to src/Connected.Common.Types.Model/Countries/ICountryService.cs
diff --git a/Connected.Common.Types.Model/Currencies/CurrencyArgs.cs b/src/Connected.Common.Types.Model/Currencies/CurrencyArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/Currencies/CurrencyArgs.cs
rename to src/Connected.Common.Types.Model/Currencies/CurrencyArgs.cs
diff --git a/Connected.Common.Types.Model/Currencies/ICurrency.cs b/src/Connected.Common.Types.Model/Currencies/ICurrency.cs
similarity index 100%
rename from Connected.Common.Types.Model/Currencies/ICurrency.cs
rename to src/Connected.Common.Types.Model/Currencies/ICurrency.cs
diff --git a/Connected.Common.Types.Model/Currencies/ICurrencyService.cs b/src/Connected.Common.Types.Model/Currencies/ICurrencyService.cs
similarity index 100%
rename from Connected.Common.Types.Model/Currencies/ICurrencyService.cs
rename to src/Connected.Common.Types.Model/Currencies/ICurrencyService.cs
diff --git a/Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs b/src/Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs
similarity index 100%
rename from Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs
rename to src/Connected.Common.Types.Model/MeasureUnits/IMeasureUnit.cs
diff --git a/Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs b/src/Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs
similarity index 100%
rename from Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs
rename to src/Connected.Common.Types.Model/MeasureUnits/IMeasureUnitService.cs
diff --git a/Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs b/src/Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs
rename to src/Connected.Common.Types.Model/MeasureUnits/MeasureUnitArgs.cs
diff --git a/Connected.Common.Types.Model/MicroService.cs b/src/Connected.Common.Types.Model/MicroService.cs
similarity index 100%
rename from Connected.Common.Types.Model/MicroService.cs
rename to src/Connected.Common.Types.Model/MicroService.cs
diff --git a/Connected.Common.Types.Model/PostalCodes/IPostalCode.cs b/src/Connected.Common.Types.Model/PostalCodes/IPostalCode.cs
similarity index 100%
rename from Connected.Common.Types.Model/PostalCodes/IPostalCode.cs
rename to src/Connected.Common.Types.Model/PostalCodes/IPostalCode.cs
diff --git a/Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs b/src/Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs
similarity index 100%
rename from Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs
rename to src/Connected.Common.Types.Model/PostalCodes/IPostalCodeService.cs
diff --git a/Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs b/src/Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs
rename to src/Connected.Common.Types.Model/PostalCodes/PostalCodeArgs.cs
diff --git a/Connected.Common.Types.Model/Routes.cs b/src/Connected.Common.Types.Model/Routes.cs
similarity index 100%
rename from Connected.Common.Types.Model/Routes.cs
rename to src/Connected.Common.Types.Model/Routes.cs
diff --git a/Connected.Common.Types.Model/TaxRates/ITaxRate.cs b/src/Connected.Common.Types.Model/TaxRates/ITaxRate.cs
similarity index 100%
rename from Connected.Common.Types.Model/TaxRates/ITaxRate.cs
rename to src/Connected.Common.Types.Model/TaxRates/ITaxRate.cs
diff --git a/Connected.Common.Types.Model/TaxRates/ITaxRateService.cs b/src/Connected.Common.Types.Model/TaxRates/ITaxRateService.cs
similarity index 100%
rename from Connected.Common.Types.Model/TaxRates/ITaxRateService.cs
rename to src/Connected.Common.Types.Model/TaxRates/ITaxRateService.cs
diff --git a/Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs b/src/Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs
similarity index 100%
rename from Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs
rename to src/Connected.Common.Types.Model/TaxRates/TaxRateArgs.cs
diff --git a/Connected.Common.Types.UI/Bootstrapper.cs b/src/Connected.Common.Types.UI/Bootstrapper.cs
similarity index 100%
rename from Connected.Common.Types.UI/Bootstrapper.cs
rename to src/Connected.Common.Types.UI/Bootstrapper.cs
diff --git a/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj b/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
similarity index 66%
rename from Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
rename to src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
index 9f998e0..e2344b8 100644
--- a/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
+++ b/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
@@ -24,10 +24,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\connected.components\Connected.Components\Connected.Components.csproj" />
-		<ProjectReference Include="..\..\Connected\Connected.Client\Connected.Client.csproj" />
-		<ProjectReference Include="..\..\connected\Connected.UI\Connected.UI.csproj" />
-		<ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
+		<ProjectReference Include="..\..\..\connected.components\src\Connected.Components\Connected.Components.csproj" />
+		<ProjectReference Include="..\..\..\Connected\src\Connected.Client\Connected.Client.csproj" />
+		<ProjectReference Include="..\..\..\connected\src\Connected.UI\Connected.UI.csproj" />
+		<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
 		<ProjectReference Include="..\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj" />
 	</ItemGroup>
 
diff --git a/Connected.Common.Types.UI/Routes.cs b/src/Connected.Common.Types.UI/Routes.cs
similarity index 100%
rename from Connected.Common.Types.UI/Routes.cs
rename to src/Connected.Common.Types.UI/Routes.cs
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
rename to src/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
diff --git a/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor b/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
rename to src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
diff --git a/Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor b/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor
rename to src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateEditPage.razor
diff --git a/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor b/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
similarity index 100%
rename from Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
rename to src/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
diff --git a/Connected.Common.Types.UI/_Imports.razor b/src/Connected.Common.Types.UI/_Imports.razor
similarity index 100%
rename from Connected.Common.Types.UI/_Imports.razor
rename to src/Connected.Common.Types.UI/_Imports.razor
diff --git a/Connected.Common.Types/Connected.Common.Types.csproj b/src/Connected.Common.Types/Connected.Common.Types.csproj
similarity index 61%
rename from Connected.Common.Types/Connected.Common.Types.csproj
rename to src/Connected.Common.Types/Connected.Common.Types.csproj
index ccc0206..4b7b7d6 100644
--- a/Connected.Common.Types/Connected.Common.Types.csproj
+++ b/src/Connected.Common.Types/Connected.Common.Types.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\connected.framework\Connected.Data\Connected.Data.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Runtime\Connected.Runtime.csproj" />
-    <ProjectReference Include="..\..\connected.framework\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Data\Connected.Data.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
     <ProjectReference Include="..\Connected.Common.Types.Middleware\Connected.Common.Types.Middleware.csproj" />
     <ProjectReference Include="..\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
   </ItemGroup>
diff --git a/Connected.Common.Types/Continents/Countries/ContinentCountry.cs b/src/Connected.Common.Types/Continents/Countries/ContinentCountry.cs
similarity index 100%
rename from Connected.Common.Types/Continents/Countries/ContinentCountry.cs
rename to src/Connected.Common.Types/Continents/Countries/ContinentCountry.cs
diff --git a/Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs b/src/Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs
similarity index 100%
rename from Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs
rename to src/Connected.Common.Types/Continents/Countries/ContinentCountryCache.cs
diff --git a/Connected.Common.Types/Continents/Countries/ContinentCountryService.cs b/src/Connected.Common.Types/Continents/Countries/ContinentCountryService.cs
similarity index 100%
rename from Connected.Common.Types/Continents/Countries/ContinentCountryService.cs
rename to src/Connected.Common.Types/Continents/Countries/ContinentCountryService.cs
diff --git a/Connected.Common.Types/Continents/Countries/ContinentProtector.cs b/src/Connected.Common.Types/Continents/Countries/ContinentProtector.cs
similarity index 100%
rename from Connected.Common.Types/Continents/Countries/ContinentProtector.cs
rename to src/Connected.Common.Types/Continents/Countries/ContinentProtector.cs
diff --git a/Connected.Common.Types/Countries/Country.cs b/src/Connected.Common.Types/Countries/Country.cs
similarity index 100%
rename from Connected.Common.Types/Countries/Country.cs
rename to src/Connected.Common.Types/Countries/Country.cs
diff --git a/Connected.Common.Types/Countries/CountryCache.cs b/src/Connected.Common.Types/Countries/CountryCache.cs
similarity index 100%
rename from Connected.Common.Types/Countries/CountryCache.cs
rename to src/Connected.Common.Types/Countries/CountryCache.cs
diff --git a/Connected.Common.Types/Countries/CountryOps.cs b/src/Connected.Common.Types/Countries/CountryOps.cs
similarity index 100%
rename from Connected.Common.Types/Countries/CountryOps.cs
rename to src/Connected.Common.Types/Countries/CountryOps.cs
diff --git a/Connected.Common.Types/Countries/CountryService.cs b/src/Connected.Common.Types/Countries/CountryService.cs
similarity index 100%
rename from Connected.Common.Types/Countries/CountryService.cs
rename to src/Connected.Common.Types/Countries/CountryService.cs
diff --git a/Connected.Common.Types/Countries/CountryValidator.cs b/src/Connected.Common.Types/Countries/CountryValidator.cs
similarity index 100%
rename from Connected.Common.Types/Countries/CountryValidator.cs
rename to src/Connected.Common.Types/Countries/CountryValidator.cs
diff --git a/Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs b/src/Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs
similarity index 100%
rename from Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs
rename to src/Connected.Common.Types/Currencies/DefaultCurrencyFormatterMiddleware.cs
diff --git a/Connected.Common.Types/Security/Claims.cs b/src/Connected.Common.Types/Security/Claims.cs
similarity index 100%
rename from Connected.Common.Types/Security/Claims.cs
rename to src/Connected.Common.Types/Security/Claims.cs
diff --git a/Connected.Common.Types/ServerStartup.cs b/src/Connected.Common.Types/ServerStartup.cs
similarity index 100%
rename from Connected.Common.Types/ServerStartup.cs
rename to src/Connected.Common.Types/ServerStartup.cs
diff --git a/Connected.Common.Types/TaxRates/TaxRate.cs b/src/Connected.Common.Types/TaxRates/TaxRate.cs
similarity index 100%
rename from Connected.Common.Types/TaxRates/TaxRate.cs
rename to src/Connected.Common.Types/TaxRates/TaxRate.cs
diff --git a/Connected.Common.Types/TaxRates/TaxRateCache.cs b/src/Connected.Common.Types/TaxRates/TaxRateCache.cs
similarity index 100%
rename from Connected.Common.Types/TaxRates/TaxRateCache.cs
rename to src/Connected.Common.Types/TaxRates/TaxRateCache.cs
diff --git a/Connected.Common.Types/TaxRates/TaxRateOps.cs b/src/Connected.Common.Types/TaxRates/TaxRateOps.cs
similarity index 100%
rename from Connected.Common.Types/TaxRates/TaxRateOps.cs
rename to src/Connected.Common.Types/TaxRates/TaxRateOps.cs
diff --git a/Connected.Common.Types/TaxRates/TaxRateService.cs b/src/Connected.Common.Types/TaxRates/TaxRateService.cs
similarity index 100%
rename from Connected.Common.Types/TaxRates/TaxRateService.cs
rename to src/Connected.Common.Types/TaxRates/TaxRateService.cs
diff --git a/Connected.Common.Types/TaxRates/TaxRatesValidators.cs b/src/Connected.Common.Types/TaxRates/TaxRatesValidators.cs
similarity index 100%
rename from Connected.Common.Types/TaxRates/TaxRatesValidators.cs
rename to src/Connected.Common.Types/TaxRates/TaxRatesValidators.cs
diff --git a/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj b/tests/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj
similarity index 87%
rename from Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj
rename to tests/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj
index 2aca654..7882837 100644
--- a/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj
+++ b/tests/Connected.Common.Types.Tests/Connected.Common.Types.Tests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Connected.Common.Types\Connected.Common.Types.csproj" />
+    <ProjectReference Include="..\..\src\Connected.Common.Types\Connected.Common.Types.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Connected.Common.Types.Tests/InstanceFaker.cs b/tests/Connected.Common.Types.Tests/InstanceFaker.cs
similarity index 100%
rename from Connected.Common.Types.Tests/InstanceFaker.cs
rename to tests/Connected.Common.Types.Tests/InstanceFaker.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/DeleteTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/LookupTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/SelectByRateTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/SelectTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/TaxRateSamples.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs
diff --git a/Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs
rename to tests/Connected.Common.Types.Tests/TaxRates/TaxRateTests.cs
diff --git a/Connected.Common.Types.Tests/TestUtils.cs b/tests/Connected.Common.Types.Tests/TestUtils.cs
similarity index 100%
rename from Connected.Common.Types.Tests/TestUtils.cs
rename to tests/Connected.Common.Types.Tests/TestUtils.cs
diff --git a/Connected.Common.Types.Tests/Usings.cs b/tests/Connected.Common.Types.Tests/Usings.cs
similarity index 100%
rename from Connected.Common.Types.Tests/Usings.cs
rename to tests/Connected.Common.Types.Tests/Usings.cs