diff --git a/DigitalData.Core.Client.Legacy/BaseHttpClientService.cs b/DigitalData.Core.Legacy.Client/BaseHttpClientService.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/BaseHttpClientService.cs
rename to DigitalData.Core.Legacy.Client/BaseHttpClientService.cs
diff --git a/DigitalData.Core.Client.Legacy/DIExtensions.cs b/DigitalData.Core.Legacy.Client/DIExtensions.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/DIExtensions.cs
rename to DigitalData.Core.Legacy.Client/DIExtensions.cs
diff --git a/DigitalData.Core.Client.Legacy/DigitalData.Core.Legacy.Client.csproj b/DigitalData.Core.Legacy.Client/DigitalData.Core.Legacy.Client.csproj
similarity index 100%
rename from DigitalData.Core.Client.Legacy/DigitalData.Core.Legacy.Client.csproj
rename to DigitalData.Core.Legacy.Client/DigitalData.Core.Legacy.Client.csproj
diff --git a/DigitalData.Core.Client.Legacy/HttpClientOptions.cs b/DigitalData.Core.Legacy.Client/HttpClientOptions.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/HttpClientOptions.cs
rename to DigitalData.Core.Legacy.Client/HttpClientOptions.cs
diff --git a/DigitalData.Core.Client.Legacy/HttpClientService.cs b/DigitalData.Core.Legacy.Client/HttpClientService.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/HttpClientService.cs
rename to DigitalData.Core.Legacy.Client/HttpClientService.cs
diff --git a/DigitalData.Core.Client.Legacy/HttpExtensions.cs b/DigitalData.Core.Legacy.Client/HttpExtensions.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/HttpExtensions.cs
rename to DigitalData.Core.Legacy.Client/HttpExtensions.cs
diff --git a/DigitalData.Core.Client.Legacy/Properties/AssemblyInfo.cs b/DigitalData.Core.Legacy.Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/Properties/AssemblyInfo.cs
rename to DigitalData.Core.Legacy.Client/Properties/AssemblyInfo.cs
diff --git a/DigitalData.Core.Client.Legacy/ServiceFactory.cs b/DigitalData.Core.Legacy.Client/ServiceFactory.cs
similarity index 100%
rename from DigitalData.Core.Client.Legacy/ServiceFactory.cs
rename to DigitalData.Core.Legacy.Client/ServiceFactory.cs
diff --git a/DigitalData.Core.Client.Legacy/app.config b/DigitalData.Core.Legacy.Client/app.config
similarity index 100%
rename from DigitalData.Core.Client.Legacy/app.config
rename to DigitalData.Core.Legacy.Client/app.config
diff --git a/DigitalData.Core.Client.Legacy/packages.config b/DigitalData.Core.Legacy.Client/packages.config
similarity index 100%
rename from DigitalData.Core.Client.Legacy/packages.config
rename to DigitalData.Core.Legacy.Client/packages.config
diff --git a/DigitalData.Core.Legacy.Tests/DigitalData.Core.Legacy.Tests.csproj b/DigitalData.Core.Legacy.Tests/DigitalData.Core.Legacy.Tests.csproj
index c8543f7..1155ed3 100644
--- a/DigitalData.Core.Legacy.Tests/DigitalData.Core.Legacy.Tests.csproj
+++ b/DigitalData.Core.Legacy.Tests/DigitalData.Core.Legacy.Tests.csproj
@@ -87,9 +87,8 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\DigitalData.Core.Client.Legacy\DigitalData.Core.Legacy.Client.csproj">
+    <ProjectReference Include="..\DigitalData.Core.Legacy.Client\DigitalData.Core.Legacy.Client.csproj">
       <Project>{e009a053-a9f4-48f2-984f-ef5c376a9b14}</Project>
       <Name>DigitalData.Core.Legacy.Client</Name>
     </ProjectReference>
diff --git a/DigitalData.Core.sln b/DigitalData.Core.sln
index 2391185..53d2008 100644
--- a/DigitalData.Core.sln
+++ b/DigitalData.Core.sln
@@ -17,10 +17,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Client", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Abstractions", "DigitalData.Core.Abstractions\DigitalData.Core.Abstractions.csproj", "{13E40DF1-6123-4838-9BF8-086C94E6ADF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Legacy.Client", "DigitalData.Core.Client.Legacy\DigitalData.Core.Legacy.Client.csproj", "{E009A053-A9F4-48F2-984F-EF5C376A9B14}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Legacy.Tests", "DigitalData.Core.Legacy.Tests\DigitalData.Core.Legacy.Tests.csproj", "{84B18026-F9A0-4366-BC69-1662D9E7342D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.Core.Legacy.Client", "DigitalData.Core.Legacy.Client\DigitalData.Core.Legacy.Client.csproj", "{E009A053-A9F4-48F2-984F-EF5C376A9B14}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,14 +54,14 @@ Global
 		{13E40DF1-6123-4838-9BF8-086C94E6ADF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{13E40DF1-6123-4838-9BF8-086C94E6ADF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13E40DF1-6123-4838-9BF8-086C94E6ADF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84B18026-F9A0-4366-BC69-1662D9E7342D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84B18026-F9A0-4366-BC69-1662D9E7342D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84B18026-F9A0-4366-BC69-1662D9E7342D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84B18026-F9A0-4366-BC69-1662D9E7342D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E009A053-A9F4-48F2-984F-EF5C376A9B14}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE