Arrange folders

cnblogs · Jan 2, 2023 · 6f4742a · 6f4742a
1 parent 0d2711c
commit 6f4742a
Show file tree

Hide file tree

Showing 192 changed files with 16 additions and 16 deletions.
diff --git a/EnyimCachingCore.sln b/EnyimCachingCore.sln
@@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.Caching", "Enyim.Caching\Enyim.Caching.csproj", "{0EC50FBB-03B7-4B76-9D72-AADCB8BB3A8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.Caching", "src\Enyim.Caching\Enyim.Caching.csproj", "{0EC50FBB-03B7-4B76-9D72-AADCB8BB3A8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApp", "SampleWebApp\SampleWebApp.csproj", "{7F795CB9-6058-4137-B069-12C1B8D4132B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApp", "sample\SampleWebApp\SampleWebApp.csproj", "{7F795CB9-6058-4137-B069-12C1B8D4132B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.Caching.Tests", "Enyim.Caching.Tests\Enyim.Caching.Tests.csproj", "{FAF5E655-9ED4-4934-94F9-F0EDB77143AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.Caching.Tests", "test\Enyim.Caching.Tests\Enyim.Caching.Tests.csproj", "{FAF5E655-9ED4-4934-94F9-F0EDB77143AC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MemcachedTest", "MemcachedTest\MemcachedTest.csproj", "{3DDAC26F-8B56-4F69-8C69-A3CB6CF6B12B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MemcachedTest", "test\MemcachedTest\MemcachedTest.csproj", "{3DDAC26F-8B56-4F69-8C69-A3CB6CF6B12B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{597372A2-9EE1-4A10-96FE-9D4E3AC85676}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{46CD2BBA-9846-42FA-823B-D03F68F81647}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{9954C92E-50E2-477C-AC47-31C857C46370}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApp.IntegrationTests", "SampleWebApp.IntegrationTests\SampleWebApp.IntegrationTests.csproj", "{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApp.IntegrationTests", "test\SampleWebApp.IntegrationTests\SampleWebApp.IntegrationTests.csproj", "{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.StressTest", "Enyim.StressTest\Enyim.StressTest.csproj", "{ADA7F6B5-619D-4435-83BF-AD558823EC40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Enyim.StressTest", "test\Enyim.StressTest\Enyim.StressTest.csproj", "{ADA7F6B5-619D-4435-83BF-AD558823EC40}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedCacheTests", "DistributedCacheTets\DistributedCacheTests.csproj", "{450F1A40-F81B-4BEE-818B-3FCDE630D96F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistributedCacheTests", "test\DistributedCacheTests\DistributedCacheTests.csproj", "{450F1A40-F81B-4BEE-818B-3FCDE630D96F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -66,7 +66,7 @@ Global
 		{7F795CB9-6058-4137-B069-12C1B8D4132B} = {9954C92E-50E2-477C-AC47-31C857C46370}
 		{FAF5E655-9ED4-4934-94F9-F0EDB77143AC} = {46CD2BBA-9846-42FA-823B-D03F68F81647}
 		{3DDAC26F-8B56-4F69-8C69-A3CB6CF6B12B} = {46CD2BBA-9846-42FA-823B-D03F68F81647}
-		{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C} = {9954C92E-50E2-477C-AC47-31C857C46370}
+		{281CA49A-FEA5-4008-8D3D-0C4E1C548B8C} = {46CD2BBA-9846-42FA-823B-D03F68F81647}
 		{ADA7F6B5-619D-4435-83BF-AD558823EC40} = {46CD2BBA-9846-42FA-823B-D03F68F81647}
 		{450F1A40-F81B-4BEE-818B-3FCDE630D96F} = {46CD2BBA-9846-42FA-823B-D03F68F81647}
 	EndGlobalSection

diff --git a/pack.sh b/pack.sh
@@ -4,6 +4,6 @@ set -e
 [ -z $1 ] && echo "Missing version" && exit 1
 
 version=$1
-project=Enyim.Caching
+project=src/Enyim.Caching
 dotnet build -p:version=$version -c Release $project
 dotnet pack $project -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg --include-source -p:Version=$version -o ./artifacts
diff --git a/sample/.gitkeep b/sample/.gitkeep
diff --git a/SampleWebApp/Controllers/HomeController.cs → ...ampleWebApp/Controllers/HomeController.cs b/SampleWebApp/Controllers/HomeController.cs → ...ampleWebApp/Controllers/HomeController.cs
diff --git a/SampleWebApp/Models/BlogPost.cs → sample/SampleWebApp/Models/BlogPost.cs b/SampleWebApp/Models/BlogPost.cs → sample/SampleWebApp/Models/BlogPost.cs
diff --git a/SampleWebApp/Models/PostBody.cs → sample/SampleWebApp/Models/PostBody.cs b/SampleWebApp/Models/PostBody.cs → sample/SampleWebApp/Models/PostBody.cs
diff --git a/SampleWebApp/Program.cs → sample/SampleWebApp/Program.cs b/SampleWebApp/Program.cs → sample/SampleWebApp/Program.cs
diff --git a/SampleWebApp/Properties/launchSettings.json → ...mpleWebApp/Properties/launchSettings.json b/SampleWebApp/Properties/launchSettings.json → ...mpleWebApp/Properties/launchSettings.json
diff --git a/SampleWebApp/SampleWebApp.csproj → sample/SampleWebApp/SampleWebApp.csproj b/SampleWebApp/SampleWebApp.csproj → sample/SampleWebApp/SampleWebApp.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SampleWebApp/Services/BlogPostService.cs → .../SampleWebApp/Services/BlogPostService.cs b/SampleWebApp/Services/BlogPostService.cs → .../SampleWebApp/Services/BlogPostService.cs
diff --git a/SampleWebApp/Services/IBlogPostService.cs → ...SampleWebApp/Services/IBlogPostService.cs b/SampleWebApp/Services/IBlogPostService.cs → ...SampleWebApp/Services/IBlogPostService.cs
diff --git a/SampleWebApp/Startup.cs → sample/SampleWebApp/Startup.cs b/SampleWebApp/Startup.cs → sample/SampleWebApp/Startup.cs
diff --git a/SampleWebApp/appsettings.json → sample/SampleWebApp/appsettings.json b/SampleWebApp/appsettings.json → sample/SampleWebApp/appsettings.json
diff --git a/src/.gitkeep b/src/.gitkeep
diff --git a/...figuration/AuthenticationConfiguration.cs → ...figuration/AuthenticationConfiguration.cs b/...figuration/AuthenticationConfiguration.cs → ...figuration/AuthenticationConfiguration.cs
diff --git a/...hing/Configuration/ConfigurationHelper.cs → ...hing/Configuration/ConfigurationHelper.cs b/...hing/Configuration/ConfigurationHelper.cs → ...hing/Configuration/ConfigurationHelper.cs
diff --git a/...iguration/IAuthenticationConfiguration.cs → ...iguration/IAuthenticationConfiguration.cs b/...iguration/IAuthenticationConfiguration.cs → ...iguration/IAuthenticationConfiguration.cs
diff --git a/...guration/IMemcachedClientConfiguration.cs → ...guration/IMemcachedClientConfiguration.cs b/...guration/IMemcachedClientConfiguration.cs → ...guration/IMemcachedClientConfiguration.cs
diff --git a/...Configuration/ISocketPoolConfiguration.cs → ...Configuration/ISocketPoolConfiguration.cs b/...Configuration/ISocketPoolConfiguration.cs → ...Configuration/ISocketPoolConfiguration.cs
diff --git a/...aching/Configuration/JsonVBucketConfig.cs → ...aching/Configuration/JsonVBucketConfig.cs b/...aching/Configuration/JsonVBucketConfig.cs → ...aching/Configuration/JsonVBucketConfig.cs
diff --git a/...iguration/MemcachedClientConfiguration.cs → ...iguration/MemcachedClientConfiguration.cs b/...iguration/MemcachedClientConfiguration.cs → ...iguration/MemcachedClientConfiguration.cs
diff --git a/...g/Configuration/MemcachedClientOptions.cs → ...g/Configuration/MemcachedClientOptions.cs b/...g/Configuration/MemcachedClientOptions.cs → ...g/Configuration/MemcachedClientOptions.cs
diff --git a/.../Configuration/SocketPoolConfiguration.cs → .../Configuration/SocketPoolConfiguration.cs b/.../Configuration/SocketPoolConfiguration.cs → .../Configuration/SocketPoolConfiguration.cs
diff --git a/Enyim.Caching/CountdownEvent.cs → src/Enyim.Caching/CountdownEvent.cs b/Enyim.Caching/CountdownEvent.cs → src/Enyim.Caching/CountdownEvent.cs
diff --git a/Enyim.Caching/DistributedCache.cs → src/Enyim.Caching/DistributedCache.cs b/Enyim.Caching/DistributedCache.cs → src/Enyim.Caching/DistributedCache.cs
diff --git a/Enyim.Caching/Enyim.Caching.csproj → src/Enyim.Caching/Enyim.Caching.csproj b/Enyim.Caching/Enyim.Caching.csproj → src/Enyim.Caching/Enyim.Caching.csproj
diff --git a/...mMemcachedApplicationBuilderExtensions.cs → ...mMemcachedApplicationBuilderExtensions.cs b/...mMemcachedApplicationBuilderExtensions.cs → ...mMemcachedApplicationBuilderExtensions.cs
diff --git a/...imMemcachedServiceCollectionExtensions.cs → ...imMemcachedServiceCollectionExtensions.cs b/...imMemcachedServiceCollectionExtensions.cs → ...imMemcachedServiceCollectionExtensions.cs
diff --git a/Enyim.Caching/FastActivator.cs → src/Enyim.Caching/FastActivator.cs b/Enyim.Caching/FastActivator.cs → src/Enyim.Caching/FastActivator.cs
diff --git a/Enyim.Caching/FnvHash.cs → src/Enyim.Caching/FnvHash.cs b/Enyim.Caching/FnvHash.cs → src/Enyim.Caching/FnvHash.cs
diff --git a/Enyim.Caching/HashCodeCombiner.cs → src/Enyim.Caching/HashCodeCombiner.cs b/Enyim.Caching/HashCodeCombiner.cs → src/Enyim.Caching/HashCodeCombiner.cs
diff --git a/Enyim.Caching/HashkitCrc32.cs → src/Enyim.Caching/HashkitCrc32.cs b/Enyim.Caching/HashkitCrc32.cs → src/Enyim.Caching/HashkitCrc32.cs
diff --git a/Enyim.Caching/HashkitMurmur.cs → src/Enyim.Caching/HashkitMurmur.cs b/Enyim.Caching/HashkitMurmur.cs → src/Enyim.Caching/HashkitMurmur.cs
diff --git a/Enyim.Caching/HashkitOneAtATime.cs → src/Enyim.Caching/HashkitOneAtATime.cs b/Enyim.Caching/HashkitOneAtATime.cs → src/Enyim.Caching/HashkitOneAtATime.cs
diff --git a/Enyim.Caching/IFastObjectFacory.cs → src/Enyim.Caching/IFastObjectFacory.cs b/Enyim.Caching/IFastObjectFacory.cs → src/Enyim.Caching/IFastObjectFacory.cs
diff --git a/Enyim.Caching/IMemcachedClient.cs → src/Enyim.Caching/IMemcachedClient.cs b/Enyim.Caching/IMemcachedClient.cs → src/Enyim.Caching/IMemcachedClient.cs
diff --git a/Enyim.Caching/IMemcachedClientT.cs → src/Enyim.Caching/IMemcachedClientT.cs b/Enyim.Caching/IMemcachedClientT.cs → src/Enyim.Caching/IMemcachedClientT.cs
diff --git a/Enyim.Caching/IMemcachedResultsClient.cs → src/Enyim.Caching/IMemcachedResultsClient.cs b/Enyim.Caching/IMemcachedResultsClient.cs → src/Enyim.Caching/IMemcachedResultsClient.cs
diff --git a/Enyim.Caching/IUIntHashAlgorithm.cs → src/Enyim.Caching/IUIntHashAlgorithm.cs b/Enyim.Caching/IUIntHashAlgorithm.cs → src/Enyim.Caching/IUIntHashAlgorithm.cs
diff --git a/Enyim.Caching/InterlockedQueue.cs → src/Enyim.Caching/InterlockedQueue.cs b/Enyim.Caching/InterlockedQueue.cs → src/Enyim.Caching/InterlockedQueue.cs
diff --git a/Enyim.Caching/InterlockedStack.cs → src/Enyim.Caching/InterlockedStack.cs b/Enyim.Caching/InterlockedStack.cs → src/Enyim.Caching/InterlockedStack.cs
diff --git a/Enyim.Caching/Logging/DiagnosticsLog.cs → src/Enyim.Caching/Logging/DiagnosticsLog.cs b/Enyim.Caching/Logging/DiagnosticsLog.cs → src/Enyim.Caching/Logging/DiagnosticsLog.cs
diff --git a/Enyim.Caching/Logging/ILog.cs → src/Enyim.Caching/Logging/ILog.cs b/Enyim.Caching/Logging/ILog.cs → src/Enyim.Caching/Logging/ILog.cs
diff --git a/Enyim.Caching/Logging/ILogFactory.cs → src/Enyim.Caching/Logging/ILogFactory.cs b/Enyim.Caching/Logging/ILogFactory.cs → src/Enyim.Caching/Logging/ILogFactory.cs
diff --git a/Enyim.Caching/Logging/LogManager.cs → src/Enyim.Caching/Logging/LogManager.cs b/Enyim.Caching/Logging/LogManager.cs → src/Enyim.Caching/Logging/LogManager.cs
diff --git a/Enyim.Caching/Logging/NullLog.cs → src/Enyim.Caching/Logging/NullLog.cs b/Enyim.Caching/Logging/NullLog.cs → src/Enyim.Caching/Logging/NullLog.cs
diff --git a/.../Authentication/PlainTextAuthenticator.cs → .../Authentication/PlainTextAuthenticator.cs b/.../Authentication/PlainTextAuthenticator.cs → .../Authentication/PlainTextAuthenticator.cs
diff --git a/...Memcached/CommandNotSupportedException.cs → ...Memcached/CommandNotSupportedException.cs b/...Memcached/CommandNotSupportedException.cs → ...Memcached/CommandNotSupportedException.cs
diff --git a/Enyim.Caching/Memcached/DefaultServerPool.cs → ...im.Caching/Memcached/DefaultServerPool.cs b/Enyim.Caching/Memcached/DefaultServerPool.cs → ...im.Caching/Memcached/DefaultServerPool.cs
diff --git a/Enyim.Caching/Memcached/Enums.cs → src/Enyim.Caching/Memcached/Enums.cs b/Enyim.Caching/Memcached/Enums.cs → src/Enyim.Caching/Memcached/Enums.cs
diff --git a/...ed/FailurePolicy/FailImmediatelyPolicy.cs → ...ed/FailurePolicy/FailImmediatelyPolicy.cs b/...ed/FailurePolicy/FailImmediatelyPolicy.cs → ...ed/FailurePolicy/FailImmediatelyPolicy.cs
diff --git a/...ached/FailurePolicy/INodeFailurePolicy.cs → ...ached/FailurePolicy/INodeFailurePolicy.cs b/...ached/FailurePolicy/INodeFailurePolicy.cs → ...ached/FailurePolicy/INodeFailurePolicy.cs
diff --git a/.../FailurePolicy/ThrottlingFailurePolicy.cs → .../FailurePolicy/ThrottlingFailurePolicy.cs b/.../FailurePolicy/ThrottlingFailurePolicy.cs → .../FailurePolicy/ThrottlingFailurePolicy.cs
diff --git a/Enyim.Caching/Memcached/IAuthenticator.cs → ...Enyim.Caching/Memcached/IAuthenticator.cs b/Enyim.Caching/Memcached/IAuthenticator.cs → ...Enyim.Caching/Memcached/IAuthenticator.cs
diff --git a/...ing/Memcached/IMemcachedKeyTransformer.cs → ...ing/Memcached/IMemcachedKeyTransformer.cs b/...ing/Memcached/IMemcachedKeyTransformer.cs → ...ing/Memcached/IMemcachedKeyTransformer.cs
diff --git a/Enyim.Caching/Memcached/IMemcachedNode.cs → ...Enyim.Caching/Memcached/IMemcachedNode.cs b/Enyim.Caching/Memcached/IMemcachedNode.cs → ...Enyim.Caching/Memcached/IMemcachedNode.cs
diff --git a/...aching/Memcached/IMemcachedNodeLocator.cs → ...aching/Memcached/IMemcachedNodeLocator.cs b/...aching/Memcached/IMemcachedNodeLocator.cs → ...aching/Memcached/IMemcachedNodeLocator.cs
diff --git a/Enyim.Caching/Memcached/IOperationFactory.cs → ...im.Caching/Memcached/IOperationFactory.cs b/Enyim.Caching/Memcached/IOperationFactory.cs → ...im.Caching/Memcached/IOperationFactory.cs
diff --git a/Enyim.Caching/Memcached/IProviderFactory.cs → ...yim.Caching/Memcached/IProviderFactory.cs b/Enyim.Caching/Memcached/IProviderFactory.cs → ...yim.Caching/Memcached/IProviderFactory.cs
diff --git a/.../Memcached/ISaslAuthenticationProvider.cs → .../Memcached/ISaslAuthenticationProvider.cs b/.../Memcached/ISaslAuthenticationProvider.cs → .../Memcached/ISaslAuthenticationProvider.cs
diff --git a/Enyim.Caching/Memcached/IServerPool.cs → src/Enyim.Caching/Memcached/IServerPool.cs b/Enyim.Caching/Memcached/IServerPool.cs → src/Enyim.Caching/Memcached/IServerPool.cs
diff --git a/...d/KeyTransformers/Base64KeyTransformer.cs → ...d/KeyTransformers/Base64KeyTransformer.cs b/...d/KeyTransformers/Base64KeyTransformer.cs → ...d/KeyTransformers/Base64KeyTransformer.cs
diff --git a/.../KeyTransformers/DefaultKeyTransformer.cs → .../KeyTransformers/DefaultKeyTransformer.cs b/.../KeyTransformers/DefaultKeyTransformer.cs → .../KeyTransformers/DefaultKeyTransformer.cs
diff --git a/...hed/KeyTransformers/KeyTransformerBase.cs → ...hed/KeyTransformers/KeyTransformerBase.cs b/...hed/KeyTransformers/KeyTransformerBase.cs → ...hed/KeyTransformers/KeyTransformerBase.cs
diff --git a/.../KeyTransformers/KeyTransformerUtility.cs → .../KeyTransformers/KeyTransformerUtility.cs b/.../KeyTransformers/KeyTransformerUtility.cs → .../KeyTransformers/KeyTransformerUtility.cs
diff --git a/...hed/KeyTransformers/SHA1KeyTransformer.cs → ...hed/KeyTransformers/SHA1KeyTransformer.cs b/...hed/KeyTransformers/SHA1KeyTransformer.cs → ...hed/KeyTransformers/SHA1KeyTransformer.cs
diff --git a/...eyTransformers/TigerHashKeyTransformer.cs → ...eyTransformers/TigerHashKeyTransformer.cs b/...eyTransformers/TigerHashKeyTransformer.cs → ...eyTransformers/TigerHashKeyTransformer.cs
diff --git a/.../Memcached/Locators/DefaultNodeLocator.cs → .../Memcached/Locators/DefaultNodeLocator.cs b/.../Memcached/Locators/DefaultNodeLocator.cs → .../Memcached/Locators/DefaultNodeLocator.cs
diff --git a/...rs/Factories/DefaultNodeLocatorFactory.cs → ...rs/Factories/DefaultNodeLocatorFactory.cs b/...rs/Factories/DefaultNodeLocatorFactory.cs → ...rs/Factories/DefaultNodeLocatorFactory.cs
diff --git a/...g/Memcached/Locators/SingleNodeLocator.cs → ...g/Memcached/Locators/SingleNodeLocator.cs b/...g/Memcached/Locators/SingleNodeLocator.cs → ...g/Memcached/Locators/SingleNodeLocator.cs
diff --git a/...ing/Memcached/MemcachedClientException.cs → ...ing/Memcached/MemcachedClientException.cs b/...ing/Memcached/MemcachedClientException.cs → ...ing/Memcached/MemcachedClientException.cs
diff --git a/...m.Caching/Memcached/MemcachedException.cs → ...m.Caching/Memcached/MemcachedException.cs b/...m.Caching/Memcached/MemcachedException.cs → ...m.Caching/Memcached/MemcachedException.cs
diff --git a/Enyim.Caching/Memcached/MemcachedNode.cs → src/Enyim.Caching/Memcached/MemcachedNode.cs b/Enyim.Caching/Memcached/MemcachedNode.cs → src/Enyim.Caching/Memcached/MemcachedNode.cs
diff --git a/....Caching/Memcached/OperationInterfaces.cs → ....Caching/Memcached/OperationInterfaces.cs b/....Caching/Memcached/OperationInterfaces.cs → ....Caching/Memcached/OperationInterfaces.cs
diff --git a/Enyim.Caching/Memcached/PooledSocket.cs → src/Enyim.Caching/Memcached/PooledSocket.cs b/Enyim.Caching/Memcached/PooledSocket.cs → src/Enyim.Caching/Memcached/PooledSocket.cs
diff --git a/...cached/Protocol/Binary/BinaryConverter.cs → ...cached/Protocol/Binary/BinaryConverter.cs b/...cached/Protocol/Binary/BinaryConverter.cs → ...cached/Protocol/Binary/BinaryConverter.cs
diff --git a/...otocol/Binary/BinaryMultiItemOperation.cs → ...otocol/Binary/BinaryMultiItemOperation.cs b/...otocol/Binary/BinaryMultiItemOperation.cs → ...otocol/Binary/BinaryMultiItemOperation.cs
diff --git a/...g/Memcached/Protocol/Binary/BinaryNode.cs → ...g/Memcached/Protocol/Binary/BinaryNode.cs b/...g/Memcached/Protocol/Binary/BinaryNode.cs → ...g/Memcached/Protocol/Binary/BinaryNode.cs
diff --git a/...cached/Protocol/Binary/BinaryOperation.cs → ...cached/Protocol/Binary/BinaryOperation.cs b/...cached/Protocol/Binary/BinaryOperation.cs → ...cached/Protocol/Binary/BinaryOperation.cs
diff --git a/...Protocol/Binary/BinaryOperationFactory.cs → ...Protocol/Binary/BinaryOperationFactory.cs b/...Protocol/Binary/BinaryOperationFactory.cs → ...Protocol/Binary/BinaryOperationFactory.cs
diff --git a/...g/Memcached/Protocol/Binary/BinaryPool.cs → ...g/Memcached/Protocol/Binary/BinaryPool.cs b/...g/Memcached/Protocol/Binary/BinaryPool.cs → ...g/Memcached/Protocol/Binary/BinaryPool.cs
diff --git a/...emcached/Protocol/Binary/BinaryRequest.cs → ...emcached/Protocol/Binary/BinaryRequest.cs b/...emcached/Protocol/Binary/BinaryRequest.cs → ...emcached/Protocol/Binary/BinaryRequest.cs
diff --git a/...mcached/Protocol/Binary/BinaryResponse.cs → ...mcached/Protocol/Binary/BinaryResponse.cs b/...mcached/Protocol/Binary/BinaryResponse.cs → ...mcached/Protocol/Binary/BinaryResponse.cs
diff --git a/...tocol/Binary/BinarySingleItemOperation.cs → ...tocol/Binary/BinarySingleItemOperation.cs b/...tocol/Binary/BinarySingleItemOperation.cs → ...tocol/Binary/BinarySingleItemOperation.cs
diff --git a/...cached/Protocol/Binary/ConcatOperation.cs → ...cached/Protocol/Binary/ConcatOperation.cs b/...cached/Protocol/Binary/ConcatOperation.cs → ...cached/Protocol/Binary/ConcatOperation.cs
diff --git a/...cached/Protocol/Binary/DeleteOperation.cs → ...cached/Protocol/Binary/DeleteOperation.cs b/...cached/Protocol/Binary/DeleteOperation.cs → ...cached/Protocol/Binary/DeleteOperation.cs
diff --git a/...mcached/Protocol/Binary/FlushOperation.cs → ...mcached/Protocol/Binary/FlushOperation.cs b/...mcached/Protocol/Binary/FlushOperation.cs → ...mcached/Protocol/Binary/FlushOperation.cs
diff --git a/...Memcached/Protocol/Binary/GetOperation.cs → ...Memcached/Protocol/Binary/GetOperation.cs b/...Memcached/Protocol/Binary/GetOperation.cs → ...Memcached/Protocol/Binary/GetOperation.cs
diff --git a/...ched/Protocol/Binary/MultiGetOperation.cs → ...ched/Protocol/Binary/MultiGetOperation.cs b/...ched/Protocol/Binary/MultiGetOperation.cs → ...ched/Protocol/Binary/MultiGetOperation.cs
diff --git a/...ached/Protocol/Binary/MutatorOperation.cs → ...ached/Protocol/Binary/MutatorOperation.cs b/...ached/Protocol/Binary/MutatorOperation.cs → ...ached/Protocol/Binary/MutatorOperation.cs
diff --git a/...ching/Memcached/Protocol/Binary/OpCode.cs → ...ching/Memcached/Protocol/Binary/OpCode.cs b/...ching/Memcached/Protocol/Binary/OpCode.cs → ...ching/Memcached/Protocol/Binary/OpCode.cs
diff --git a/...Memcached/Protocol/Binary/SaslContinue.cs → ...Memcached/Protocol/Binary/SaslContinue.cs b/...Memcached/Protocol/Binary/SaslContinue.cs → ...Memcached/Protocol/Binary/SaslContinue.cs
diff --git a/...ng/Memcached/Protocol/Binary/SaslStart.cs → ...ng/Memcached/Protocol/Binary/SaslStart.cs b/...ng/Memcached/Protocol/Binary/SaslStart.cs → ...ng/Memcached/Protocol/Binary/SaslStart.cs
diff --git a/...ing/Memcached/Protocol/Binary/SaslStep.cs → ...ing/Memcached/Protocol/Binary/SaslStep.cs b/...ing/Memcached/Protocol/Binary/SaslStep.cs → ...ing/Memcached/Protocol/Binary/SaslStep.cs
diff --git a/...mcached/Protocol/Binary/StatsOperation.cs → ...mcached/Protocol/Binary/StatsOperation.cs b/...mcached/Protocol/Binary/StatsOperation.cs → ...mcached/Protocol/Binary/StatsOperation.cs
diff --git a/...mcached/Protocol/Binary/StoreOperation.cs → ...mcached/Protocol/Binary/StoreOperation.cs b/...mcached/Protocol/Binary/StoreOperation.cs → ...mcached/Protocol/Binary/StoreOperation.cs
diff --git a/...ching/Memcached/Protocol/ItemOperation.cs → ...ching/Memcached/Protocol/ItemOperation.cs b/...ching/Memcached/Protocol/ItemOperation.cs → ...ching/Memcached/Protocol/ItemOperation.cs
diff --git a/.../Memcached/Protocol/MultiItemOperation.cs → .../Memcached/Protocol/MultiItemOperation.cs b/.../Memcached/Protocol/MultiItemOperation.cs → .../Memcached/Protocol/MultiItemOperation.cs
diff --git a/...m.Caching/Memcached/Protocol/Operation.cs → ...m.Caching/Memcached/Protocol/Operation.cs b/...m.Caching/Memcached/Protocol/Operation.cs → ...m.Caching/Memcached/Protocol/Operation.cs
diff --git a/...g/Memcached/Protocol/Text/CasOperation.cs → ...g/Memcached/Protocol/Text/CasOperation.cs b/...g/Memcached/Protocol/Text/CasOperation.cs → ...g/Memcached/Protocol/Text/CasOperation.cs
diff --git a/...mcached/Protocol/Text/ConcateOperation.cs → ...mcached/Protocol/Text/ConcateOperation.cs b/...mcached/Protocol/Text/ConcateOperation.cs → ...mcached/Protocol/Text/ConcateOperation.cs
diff --git a/...emcached/Protocol/Text/DeleteOperation.cs → ...emcached/Protocol/Text/DeleteOperation.cs b/...emcached/Protocol/Text/DeleteOperation.cs → ...emcached/Protocol/Text/DeleteOperation.cs
diff --git a/...Memcached/Protocol/Text/FlushOperation.cs → ...Memcached/Protocol/Text/FlushOperation.cs b/...Memcached/Protocol/Text/FlushOperation.cs → ...Memcached/Protocol/Text/FlushOperation.cs
diff --git a/...hing/Memcached/Protocol/Text/GetHelper.cs → ...hing/Memcached/Protocol/Text/GetHelper.cs b/...hing/Memcached/Protocol/Text/GetHelper.cs → ...hing/Memcached/Protocol/Text/GetHelper.cs
diff --git a/...g/Memcached/Protocol/Text/GetOperation.cs → ...g/Memcached/Protocol/Text/GetOperation.cs b/...g/Memcached/Protocol/Text/GetOperation.cs → ...g/Memcached/Protocol/Text/GetOperation.cs
diff --git a/...cached/Protocol/Text/MultiGetOperation.cs → ...cached/Protocol/Text/MultiGetOperation.cs b/...cached/Protocol/Text/MultiGetOperation.cs → ...cached/Protocol/Text/MultiGetOperation.cs
diff --git a/...mcached/Protocol/Text/MutatorOperation.cs → ...mcached/Protocol/Text/MutatorOperation.cs b/...mcached/Protocol/Text/MutatorOperation.cs → ...mcached/Protocol/Text/MutatorOperation.cs
diff --git a/...Memcached/Protocol/Text/StatsOperation.cs → ...Memcached/Protocol/Text/StatsOperation.cs b/...Memcached/Protocol/Text/StatsOperation.cs → ...Memcached/Protocol/Text/StatsOperation.cs
diff --git a/...Memcached/Protocol/Text/StoreOperation.cs → ...Memcached/Protocol/Text/StoreOperation.cs b/...Memcached/Protocol/Text/StoreOperation.cs → ...Memcached/Protocol/Text/StoreOperation.cs
diff --git a/...ached/Protocol/Text/StoreOperationBase.cs → ...ached/Protocol/Text/StoreOperationBase.cs b/...ached/Protocol/Text/StoreOperationBase.cs → ...ached/Protocol/Text/StoreOperationBase.cs
diff --git a/...hed/Protocol/Text/TextOperationFactory.cs → ...hed/Protocol/Text/TextOperationFactory.cs b/...hed/Protocol/Text/TextOperationFactory.cs → ...hed/Protocol/Text/TextOperationFactory.cs
diff --git a/...mcached/Protocol/Text/TextSocketHelper.cs → ...mcached/Protocol/Text/TextSocketHelper.cs b/...mcached/Protocol/Text/TextSocketHelper.cs → ...mcached/Protocol/Text/TextSocketHelper.cs
diff --git a/...emcached/Results/BinaryOperationResult.cs → ...emcached/Results/BinaryOperationResult.cs b/...emcached/Results/BinaryOperationResult.cs → ...emcached/Results/BinaryOperationResult.cs
diff --git a/...emcached/Results/ConcatOperationResult.cs → ...emcached/Results/ConcatOperationResult.cs b/...emcached/Results/ConcatOperationResult.cs → ...emcached/Results/ConcatOperationResult.cs
diff --git a/...s/Extensions/OperationResultExtensions.cs → ...s/Extensions/OperationResultExtensions.cs b/...s/Extensions/OperationResultExtensions.cs → ...s/Extensions/OperationResultExtensions.cs
diff --git a/...es/DefaultConcatOperationResultFactory.cs → ...es/DefaultConcatOperationResultFactory.cs b/...es/DefaultConcatOperationResultFactory.cs → ...es/DefaultConcatOperationResultFactory.cs
diff --git a/...ories/DefaultGetOperationResultFactory.cs → ...ories/DefaultGetOperationResultFactory.cs b/...ories/DefaultGetOperationResultFactory.cs → ...ories/DefaultGetOperationResultFactory.cs
diff --git a/...ies/DefaultGetOperationResultFactory`1.cs → ...ies/DefaultGetOperationResultFactory`1.cs b/...ies/DefaultGetOperationResultFactory`1.cs → ...ies/DefaultGetOperationResultFactory`1.cs
diff --git a/...es/DefaultMutateOperationResultFactory.cs → ...es/DefaultMutateOperationResultFactory.cs b/...es/DefaultMutateOperationResultFactory.cs → ...es/DefaultMutateOperationResultFactory.cs
diff --git a/...es/DefaultRemoveOperationResultFactory.cs → ...es/DefaultRemoveOperationResultFactory.cs b/...es/DefaultRemoveOperationResultFactory.cs → ...es/DefaultRemoveOperationResultFactory.cs
diff --git a/...ies/DefaultStoreOperationResultFactory.cs → ...ies/DefaultStoreOperationResultFactory.cs b/...ies/DefaultStoreOperationResultFactory.cs → ...ies/DefaultStoreOperationResultFactory.cs
diff --git a/...actories/IConcatOperationResultFactory.cs → ...actories/IConcatOperationResultFactory.cs b/...actories/IConcatOperationResultFactory.cs → ...actories/IConcatOperationResultFactory.cs
diff --git a/...s/Factories/IGetOperationResultFactory.cs → ...s/Factories/IGetOperationResultFactory.cs b/...s/Factories/IGetOperationResultFactory.cs → ...s/Factories/IGetOperationResultFactory.cs
diff --git a/...Factories/IGetOperationResultFactory`1.cs → ...Factories/IGetOperationResultFactory`1.cs b/...Factories/IGetOperationResultFactory`1.cs → ...Factories/IGetOperationResultFactory`1.cs
diff --git a/...actories/IMutateOperationResultFactory.cs → ...actories/IMutateOperationResultFactory.cs b/...actories/IMutateOperationResultFactory.cs → ...actories/IMutateOperationResultFactory.cs
diff --git a/...actories/IRemoveOperationResultFactory.cs → ...actories/IRemoveOperationResultFactory.cs b/...actories/IRemoveOperationResultFactory.cs → ...actories/IRemoveOperationResultFactory.cs
diff --git a/...Factories/IStoreOperationResultFactory.cs → ...Factories/IStoreOperationResultFactory.cs b/...Factories/IStoreOperationResultFactory.cs → ...Factories/IStoreOperationResultFactory.cs
diff --git a/...g/Memcached/Results/GetOperationResult.cs → ...g/Memcached/Results/GetOperationResult.cs b/...g/Memcached/Results/GetOperationResult.cs → ...g/Memcached/Results/GetOperationResult.cs
diff --git a/...Memcached/Results/GetOperationResult`1.cs → ...Memcached/Results/GetOperationResult`1.cs b/...Memcached/Results/GetOperationResult`1.cs → ...Memcached/Results/GetOperationResult`1.cs
diff --git a/...Memcached/Results/Helpers/ResultHelper.cs → ...Memcached/Results/Helpers/ResultHelper.cs b/...Memcached/Results/Helpers/ResultHelper.cs → ...Memcached/Results/Helpers/ResultHelper.cs
diff --git a/.../Memcached/Results/ICasOperationResult.cs → .../Memcached/Results/ICasOperationResult.cs b/.../Memcached/Results/ICasOperationResult.cs → .../Memcached/Results/ICasOperationResult.cs
diff --git a/...mcached/Results/IConcatOperationResult.cs → ...mcached/Results/IConcatOperationResult.cs b/...mcached/Results/IConcatOperationResult.cs → ...mcached/Results/IConcatOperationResult.cs
diff --git a/...emcached/Results/IGetOperationResult`1.cs → ...emcached/Results/IGetOperationResult`1.cs b/...emcached/Results/IGetOperationResult`1.cs → ...emcached/Results/IGetOperationResult`1.cs
diff --git a/...Memcached/Results/IGetOperationResults.cs → ...Memcached/Results/IGetOperationResults.cs b/...Memcached/Results/IGetOperationResults.cs → ...Memcached/Results/IGetOperationResults.cs
diff --git a/...mcached/Results/IMutateOperationResult.cs → ...mcached/Results/IMutateOperationResult.cs b/...mcached/Results/IMutateOperationResult.cs → ...mcached/Results/IMutateOperationResult.cs
diff --git a/...hed/Results/INullableOperationResult`1.cs → ...hed/Results/INullableOperationResult`1.cs b/...hed/Results/INullableOperationResult`1.cs → ...hed/Results/INullableOperationResult`1.cs
diff --git a/...ing/Memcached/Results/IOperationResult.cs → ...ing/Memcached/Results/IOperationResult.cs b/...ing/Memcached/Results/IOperationResult.cs → ...ing/Memcached/Results/IOperationResult.cs
diff --git a/.../Memcached/Results/IPooledSocketResult.cs → .../Memcached/Results/IPooledSocketResult.cs b/.../Memcached/Results/IPooledSocketResult.cs → .../Memcached/Results/IPooledSocketResult.cs
diff --git a/...mcached/Results/IRemoveOperationResult.cs → ...mcached/Results/IRemoveOperationResult.cs b/...mcached/Results/IRemoveOperationResult.cs → ...mcached/Results/IRemoveOperationResult.cs
diff --git a/...emcached/Results/IStoreOperationResult.cs → ...emcached/Results/IStoreOperationResult.cs b/...emcached/Results/IStoreOperationResult.cs → ...emcached/Results/IStoreOperationResult.cs
diff --git a/...emcached/Results/MutateOperationResult.cs → ...emcached/Results/MutateOperationResult.cs b/...emcached/Results/MutateOperationResult.cs → ...emcached/Results/MutateOperationResult.cs
diff --git a/.../Memcached/Results/OperationResultBase.cs → .../Memcached/Results/OperationResultBase.cs b/.../Memcached/Results/OperationResultBase.cs → .../Memcached/Results/OperationResultBase.cs
diff --git a/...g/Memcached/Results/PooledSocketResult.cs → ...g/Memcached/Results/PooledSocketResult.cs b/...g/Memcached/Results/PooledSocketResult.cs → ...g/Memcached/Results/PooledSocketResult.cs
diff --git a/...emcached/Results/RemoveOperationResult.cs → ...emcached/Results/RemoveOperationResult.cs b/...emcached/Results/RemoveOperationResult.cs → ...emcached/Results/RemoveOperationResult.cs
diff --git a/...ed/Results/StatusCodes/StatusCodeEnums.cs → ...ed/Results/StatusCodes/StatusCodeEnums.cs b/...ed/Results/StatusCodes/StatusCodeEnums.cs → ...ed/Results/StatusCodes/StatusCodeEnums.cs
diff --git a/...Results/StatusCodes/StatusCodeMessages.cs → ...Results/StatusCodes/StatusCodeMessages.cs b/...Results/StatusCodes/StatusCodeMessages.cs → ...Results/StatusCodes/StatusCodeMessages.cs
diff --git a/...Memcached/Results/StoreOperationResult.cs → ...Memcached/Results/StoreOperationResult.cs b/...Memcached/Results/StoreOperationResult.cs → ...Memcached/Results/StoreOperationResult.cs
diff --git a/.../Memcached/Results/TextOperationResult.cs → .../Memcached/Results/TextOperationResult.cs b/.../Memcached/Results/TextOperationResult.cs → .../Memcached/Results/TextOperationResult.cs
diff --git a/Enyim.Caching/Memcached/ServerStats.cs → src/Enyim.Caching/Memcached/ServerStats.cs b/Enyim.Caching/Memcached/ServerStats.cs → src/Enyim.Caching/Memcached/ServerStats.cs
diff --git a/Enyim.Caching/Memcached/SlidingBuffer.cs → src/Enyim.Caching/Memcached/SlidingBuffer.cs b/Enyim.Caching/Memcached/SlidingBuffer.cs → src/Enyim.Caching/Memcached/SlidingBuffer.cs
diff --git a/Enyim.Caching/Memcached/StatItem.cs → src/Enyim.Caching/Memcached/StatItem.cs b/Enyim.Caching/Memcached/StatItem.cs → src/Enyim.Caching/Memcached/StatItem.cs
diff --git a/Enyim.Caching/Memcached/StoreMode.cs → src/Enyim.Caching/Memcached/StoreMode.cs b/Enyim.Caching/Memcached/StoreMode.cs → src/Enyim.Caching/Memcached/StoreMode.cs
diff --git a/Enyim.Caching/Memcached/ThrowHelper.cs → src/Enyim.Caching/Memcached/ThrowHelper.cs b/Enyim.Caching/Memcached/ThrowHelper.cs → src/Enyim.Caching/Memcached/ThrowHelper.cs
diff --git a/.../Transcoders/BinaryFormatterTranscoder.cs → .../Transcoders/BinaryFormatterTranscoder.cs b/.../Transcoders/BinaryFormatterTranscoder.cs → .../Transcoders/BinaryFormatterTranscoder.cs
diff --git a/...aching/Memcached/Transcoders/CacheItem.cs → ...aching/Memcached/Transcoders/CacheItem.cs b/...aching/Memcached/Transcoders/CacheItem.cs → ...aching/Memcached/Transcoders/CacheItem.cs
diff --git a/...hed/Transcoders/DataContractTranscoder.cs → ...hed/Transcoders/DataContractTranscoder.cs b/...hed/Transcoders/DataContractTranscoder.cs → ...hed/Transcoders/DataContractTranscoder.cs
diff --git a/...emcached/Transcoders/DefaultTranscoder.cs → ...emcached/Transcoders/DefaultTranscoder.cs b/...emcached/Transcoders/DefaultTranscoder.cs → ...emcached/Transcoders/DefaultTranscoder.cs
diff --git a/...hing/Memcached/Transcoders/ITranscoder.cs → ...hing/Memcached/Transcoders/ITranscoder.cs b/...hing/Memcached/Transcoders/ITranscoder.cs → ...hing/Memcached/Transcoders/ITranscoder.cs
diff --git a/...ached/Transcoders/TypeExtensionMethods.cs → ...ached/Transcoders/TypeExtensionMethods.cs b/...ached/Transcoders/TypeExtensionMethods.cs → ...ached/Transcoders/TypeExtensionMethods.cs
diff --git a/Enyim.Caching/MemcachedClient.Results.cs → src/Enyim.Caching/MemcachedClient.Results.cs b/Enyim.Caching/MemcachedClient.Results.cs → src/Enyim.Caching/MemcachedClient.Results.cs
diff --git a/Enyim.Caching/MemcachedClient.cs → src/Enyim.Caching/MemcachedClient.cs b/Enyim.Caching/MemcachedClient.cs → src/Enyim.Caching/MemcachedClient.cs
diff --git a/Enyim.Caching/MemcachedClientT.cs → src/Enyim.Caching/MemcachedClientT.cs b/Enyim.Caching/MemcachedClientT.cs → src/Enyim.Caching/MemcachedClientT.cs
diff --git a/Enyim.Caching/NullMemcachedClient.cs → src/Enyim.Caching/NullMemcachedClient.cs b/Enyim.Caching/NullMemcachedClient.cs → src/Enyim.Caching/NullMemcachedClient.cs
diff --git a/Enyim.Caching/TigerHash.cs → src/Enyim.Caching/TigerHash.cs b/Enyim.Caching/TigerHash.cs → src/Enyim.Caching/TigerHash.cs
diff --git a/Enyim.Caching/UIntEqualityComparer.cs → src/Enyim.Caching/UIntEqualityComparer.cs b/Enyim.Caching/UIntEqualityComparer.cs → src/Enyim.Caching/UIntEqualityComparer.cs
diff --git a/test/.gitkeep b/test/.gitkeep
diff --git a/...edCacheTets/DistributedCacheCollection.cs → ...dCacheTests/DistributedCacheCollection.cs b/...edCacheTets/DistributedCacheCollection.cs → ...dCacheTests/DistributedCacheCollection.cs
diff --git a/...butedCacheTets/DistributedCacheFixture.cs → ...utedCacheTests/DistributedCacheFixture.cs b/...butedCacheTets/DistributedCacheFixture.cs → ...utedCacheTests/DistributedCacheFixture.cs
diff --git a/...ributedCacheTets/DistributedCacheTests.cs → ...ibutedCacheTests/DistributedCacheTests.cs b/...ributedCacheTets/DistributedCacheTests.cs → ...ibutedCacheTests/DistributedCacheTests.cs
diff --git a/...tedCacheTets/DistributedCacheTests.csproj → ...edCacheTests/DistributedCacheTests.csproj b/...tedCacheTets/DistributedCacheTests.csproj → ...edCacheTests/DistributedCacheTests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DistributedCacheTets/Usings.cs → test/DistributedCacheTests/Usings.cs b/DistributedCacheTets/Usings.cs → test/DistributedCacheTests/Usings.cs
diff --git a/DistributedCacheTets/appsettings.json → test/DistributedCacheTests/appsettings.json b/DistributedCacheTets/appsettings.json → test/DistributedCacheTests/appsettings.json
diff --git a/....Caching.Tests/Enyim.Caching.Tests.csproj → ....Caching.Tests/Enyim.Caching.Tests.csproj b/....Caching.Tests/Enyim.Caching.Tests.csproj → ....Caching.Tests/Enyim.Caching.Tests.csproj
@@ -15,6 +15,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
   </ItemGroup>
 </Project>
diff --git a/....Caching.Tests/MemcachedClientCasTests.cs → ....Caching.Tests/MemcachedClientCasTests.cs b/....Caching.Tests/MemcachedClientCasTests.cs → ....Caching.Tests/MemcachedClientCasTests.cs
diff --git a/...ching.Tests/MemcachedClientConcatTests.cs → ...ching.Tests/MemcachedClientConcatTests.cs b/...ching.Tests/MemcachedClientConcatTests.cs → ...ching.Tests/MemcachedClientConcatTests.cs
diff --git a/....Caching.Tests/MemcachedClientGetTests.cs → ....Caching.Tests/MemcachedClientGetTests.cs b/....Caching.Tests/MemcachedClientGetTests.cs → ....Caching.Tests/MemcachedClientGetTests.cs
diff --git a/...ching.Tests/MemcachedClientMutateTests.cs → ...ching.Tests/MemcachedClientMutateTests.cs b/...ching.Tests/MemcachedClientMutateTests.cs → ...ching.Tests/MemcachedClientMutateTests.cs
diff --git a/...ching.Tests/MemcachedClientRemoveTests.cs → ...ching.Tests/MemcachedClientRemoveTests.cs b/...ching.Tests/MemcachedClientRemoveTests.cs → ...ching.Tests/MemcachedClientRemoveTests.cs
diff --git a/...aching.Tests/MemcachedClientStoreTests.cs → ...aching.Tests/MemcachedClientStoreTests.cs b/...aching.Tests/MemcachedClientStoreTests.cs → ...aching.Tests/MemcachedClientStoreTests.cs
diff --git a/...Caching.Tests/MemcachedClientTestsBase.cs → ...Caching.Tests/MemcachedClientTestsBase.cs b/...Caching.Tests/MemcachedClientTestsBase.cs → ...Caching.Tests/MemcachedClientTestsBase.cs
diff --git a/...MemcachedClientWithKeyTransformerTests.cs → ...MemcachedClientWithKeyTransformerTests.cs b/...MemcachedClientWithKeyTransformerTests.cs → ...MemcachedClientWithKeyTransformerTests.cs
diff --git a/Enyim.StressTest/Enyim.StressTest.csproj → .../Enyim.StressTest/Enyim.StressTest.csproj b/Enyim.StressTest/Enyim.StressTest.csproj → .../Enyim.StressTest/Enyim.StressTest.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Enyim.StressTest/Program.cs → test/Enyim.StressTest/Program.cs b/Enyim.StressTest/Program.cs → test/Enyim.StressTest/Program.cs
diff --git a/Enyim.StressTest/appsettings.json → test/Enyim.StressTest/appsettings.json b/Enyim.StressTest/appsettings.json → test/Enyim.StressTest/appsettings.json
diff --git a/MemcachedTest/BinaryMemcachedClientTest.cs → ...emcachedTest/BinaryMemcachedClientTest.cs b/MemcachedTest/BinaryMemcachedClientTest.cs → ...emcachedTest/BinaryMemcachedClientTest.cs
diff --git a/MemcachedTest/FailurePolicyTest.cs → test/MemcachedTest/FailurePolicyTest.cs b/MemcachedTest/FailurePolicyTest.cs → test/MemcachedTest/FailurePolicyTest.cs
diff --git a/MemcachedTest/MemcachedClientTest.cs → test/MemcachedTest/MemcachedClientTest.cs b/MemcachedTest/MemcachedClientTest.cs → test/MemcachedTest/MemcachedClientTest.cs
diff --git a/MemcachedTest/MemcachedTest.csproj → test/MemcachedTest/MemcachedTest.csproj b/MemcachedTest/MemcachedTest.csproj → test/MemcachedTest/MemcachedTest.csproj
@@ -15,6 +15,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
   </ItemGroup>
 </Project>
diff --git a/MemcachedTest/TextMemcachedClientTest.cs → .../MemcachedTest/TextMemcachedClientTest.cs b/MemcachedTest/TextMemcachedClientTest.cs → .../MemcachedTest/TextMemcachedClientTest.cs
diff --git a/...p.IntegrationTests/HomeControllerTests.cs → ...p.IntegrationTests/HomeControllerTests.cs b/...p.IntegrationTests/HomeControllerTests.cs → ...p.IntegrationTests/HomeControllerTests.cs
diff --git a/...ationTests/Properties/launchSettings.json → ...ationTests/Properties/launchSettings.json b/...ationTests/Properties/launchSettings.json → ...ationTests/Properties/launchSettings.json
diff --git a/...ests/SampleWebApp.IntegrationTests.csproj → ...ests/SampleWebApp.IntegrationTests.csproj b/...ests/SampleWebApp.IntegrationTests.csproj → ...ests/SampleWebApp.IntegrationTests.csproj
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
-    <ProjectReference Include="..\SampleWebApp\SampleWebApp.csproj" />
+    <ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
+    <ProjectReference Include="..\..\sample\SampleWebApp\SampleWebApp.csproj" />
   </ItemGroup>
 
 </Project>