momentohq · malandis · Aug 30, 2022 · Aug 29, 2022 · Aug 29, 2022 · Aug 29, 2022
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -29,17 +29,17 @@ jobs:
 
       - name: Unit Test
         run: |
-          dotnet test MomentoTest
+          dotnet test tests/Unit/Momento.Sdk.Tests
         shell: bash
 
       - name: Integration Test
         run: |
-          dotnet test MomentoIntegrationTest
+          dotnet test tests/Integration/Momento.Sdk.Tests
         shell: bash
 
       - name: Incubating Integration Test
         run: |
-          dotnet test IncubatingIntegrationTest
+          dotnet test tests/Integration/Momento.Sdk.Incubating.Tests
         shell: bash
 
       - name: Set release
@@ -53,7 +53,7 @@ jobs:
       - name: Pack and Publish
         run: |
           set -x
-          pushd Momento
+          pushd src/Momento.Sdk
             VERSION="${{ steps.semrel.outputs.version }}"
             echo "version: ${VERSION}"
             dotnet build --configuration Release

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -34,15 +34,15 @@ jobs:
 
       - name: Unit Test
         run: |
-          dotnet test MomentoTest
+          dotnet test tests/Unit/Momento.Sdk.Tests
         shell: bash
 
       - name: Integration Test
         run: |
-          dotnet test MomentoIntegrationTest
+          dotnet test tests/Integration/Momento.Sdk.Tests
         shell: bash
 
       - name: Incubating Integration Test
         run: |
-          dotnet test IncubatingIntegrationTest
+          dotnet test tests/Integration/Momento.Sdk.Incubating.Tests
         shell: bash
diff --git a/Momento.sln → Momento.Sdk.sln b/Momento.sln → Momento.Sdk.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.810.11
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MomentoSdk", "Momento\MomentoSdk.csproj", "{188A76AD-422A-4829-B59F-9EC1C102EA38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Momento.Sdk", "src\Momento.Sdk\Momento.Sdk.csproj", "{188A76AD-422A-4829-B59F-9EC1C102EA38}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MomentoTest", "MomentoTest\MomentoTest.csproj", "{77C34767-7796-4842-BE75-20563DB3230A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Momento.Sdk.Tests.Unit", "tests\Unit\Momento.Sdk.Tests\Momento.Sdk.Tests.csproj", "{77C34767-7796-4842-BE75-20563DB3230A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MomentoIntegrationTest", "MomentoIntegrationTest\MomentoIntegrationTest.csproj", "{FB56314E-BDCF-474A-A2CD-8956934FF11B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Momento.Sdk.Tests.Integration", "tests\Integration\Momento.Sdk.Tests\Momento.Sdk.Tests.csproj", "{FB56314E-BDCF-474A-A2CD-8956934FF11B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IncubatingIntegrationTest", "IncubatingIntegrationTest\IncubatingIntegrationTest.csproj", "{A0F6221C-42A9-454B-BB82-EDB9841DF6E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Momento.Sdk.Incubating.Tests.Integration", "tests\Integration\Momento.Sdk.Incubating.Tests\Momento.Sdk.Incubating.Tests.csproj", "{A0F6221C-42A9-454B-BB82-EDB9841DF6E1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Momento/MomentoSdk.sln b/Momento/MomentoSdk.sln
diff --git a/Momento/Exceptions/AlreadyExistsException.cs → ....Sdk/Exceptions/AlreadyExistsException.cs b/Momento/Exceptions/AlreadyExistsException.cs → ....Sdk/Exceptions/AlreadyExistsException.cs
diff --git a/...nto/Exceptions/AuthenticationException.cs → ...Sdk/Exceptions/AuthenticationException.cs b/...nto/Exceptions/AuthenticationException.cs → ...Sdk/Exceptions/AuthenticationException.cs
diff --git a/Momento/Exceptions/BadRequestException.cs → ...nto.Sdk/Exceptions/BadRequestException.cs b/Momento/Exceptions/BadRequestException.cs → ...nto.Sdk/Exceptions/BadRequestException.cs
diff --git a/Momento/Exceptions/CacheExceptionMapper.cs → ...to.Sdk/Exceptions/CacheExceptionMapper.cs b/Momento/Exceptions/CacheExceptionMapper.cs → ...to.Sdk/Exceptions/CacheExceptionMapper.cs
diff --git a/Momento/Exceptions/CancelledException.cs → ...ento.Sdk/Exceptions/CancelledException.cs b/Momento/Exceptions/CancelledException.cs → ...ento.Sdk/Exceptions/CancelledException.cs
diff --git a/Momento/Exceptions/ClientSdkException.cs → ...ento.Sdk/Exceptions/ClientSdkException.cs b/Momento/Exceptions/ClientSdkException.cs → ...ento.Sdk/Exceptions/ClientSdkException.cs
diff --git a/...nto/Exceptions/InternalServerException.cs → ...Sdk/Exceptions/InternalServerException.cs b/...nto/Exceptions/InternalServerException.cs → ...Sdk/Exceptions/InternalServerException.cs
diff --git a/...to/Exceptions/InvalidArgumentException.cs → ...dk/Exceptions/InvalidArgumentException.cs b/...to/Exceptions/InvalidArgumentException.cs → ...dk/Exceptions/InvalidArgumentException.cs
diff --git a/Momento/Exceptions/LimitExceededException.cs → ....Sdk/Exceptions/LimitExceededException.cs b/Momento/Exceptions/LimitExceededException.cs → ....Sdk/Exceptions/LimitExceededException.cs
diff --git a/...nto/Exceptions/MomentoServiceException.cs → ...Sdk/Exceptions/MomentoServiceException.cs b/...nto/Exceptions/MomentoServiceException.cs → ...Sdk/Exceptions/MomentoServiceException.cs
diff --git a/Momento/Exceptions/NotFoundException.cs → ...mento.Sdk/Exceptions/NotFoundException.cs b/Momento/Exceptions/NotFoundException.cs → ...mento.Sdk/Exceptions/NotFoundException.cs
diff --git a/...o/Exceptions/PermissionDeniedException.cs → ...k/Exceptions/PermissionDeniedException.cs b/...o/Exceptions/PermissionDeniedException.cs → ...k/Exceptions/PermissionDeniedException.cs
diff --git a/Momento/Exceptions/SdkException.cs → src/Momento.Sdk/Exceptions/SdkException.cs b/Momento/Exceptions/SdkException.cs → src/Momento.Sdk/Exceptions/SdkException.cs
diff --git a/Momento/Exceptions/TimeoutException.cs → ...omento.Sdk/Exceptions/TimeoutException.cs b/Momento/Exceptions/TimeoutException.cs → ...omento.Sdk/Exceptions/TimeoutException.cs
diff --git a/Momento/ISimpleCacheClient.cs → src/Momento.Sdk/ISimpleCacheClient.cs b/Momento/ISimpleCacheClient.cs → src/Momento.Sdk/ISimpleCacheClient.cs
diff --git a/Momento/Incubating/Internal/ScsDataClient.cs → ....Sdk/Incubating/Internal/ScsDataClient.cs b/Momento/Incubating/Internal/ScsDataClient.cs → ....Sdk/Incubating/Internal/ScsDataClient.cs
diff --git a/Momento/Incubating/README.md → src/Momento.Sdk/Incubating/README.md b/Momento/Incubating/README.md → src/Momento.Sdk/Incubating/README.md
diff --git a/...esponses/CacheDictionaryDeleteResponse.cs → ...esponses/CacheDictionaryDeleteResponse.cs b/...esponses/CacheDictionaryDeleteResponse.cs → ...esponses/CacheDictionaryDeleteResponse.cs
diff --git a/...Responses/CacheDictionaryFetchResponse.cs → ...Responses/CacheDictionaryFetchResponse.cs b/...Responses/CacheDictionaryFetchResponse.cs → ...Responses/CacheDictionaryFetchResponse.cs
diff --git a/...ponses/CacheDictionaryGetBatchResponse.cs → ...ponses/CacheDictionaryGetBatchResponse.cs b/...ponses/CacheDictionaryGetBatchResponse.cs → ...ponses/CacheDictionaryGetBatchResponse.cs
diff --git a/...g/Responses/CacheDictionaryGetResponse.cs → ...g/Responses/CacheDictionaryGetResponse.cs b/...g/Responses/CacheDictionaryGetResponse.cs → ...g/Responses/CacheDictionaryGetResponse.cs
diff --git a/...ses/CacheDictionaryRemoveFieldResponse.cs → ...ses/CacheDictionaryRemoveFieldResponse.cs b/...ses/CacheDictionaryRemoveFieldResponse.cs → ...ses/CacheDictionaryRemoveFieldResponse.cs
diff --git a/...es/CacheDictionaryRemoveFieldsResponse.cs → ...es/CacheDictionaryRemoveFieldsResponse.cs b/...es/CacheDictionaryRemoveFieldsResponse.cs → ...es/CacheDictionaryRemoveFieldsResponse.cs
diff --git a/...ponses/CacheDictionarySetBatchResponse.cs → ...ponses/CacheDictionarySetBatchResponse.cs b/...ponses/CacheDictionarySetBatchResponse.cs → ...ponses/CacheDictionarySetBatchResponse.cs
diff --git a/...g/Responses/CacheDictionarySetResponse.cs → ...g/Responses/CacheDictionarySetResponse.cs b/...g/Responses/CacheDictionarySetResponse.cs → ...g/Responses/CacheDictionarySetResponse.cs
diff --git a/...ating/Responses/CacheListFetchResponse.cs → ...ating/Responses/CacheListFetchResponse.cs b/...ating/Responses/CacheListFetchResponse.cs → ...ating/Responses/CacheListFetchResponse.cs
diff --git a/...ing/Responses/CacheListPopBackResponse.cs → ...ing/Responses/CacheListPopBackResponse.cs b/...ing/Responses/CacheListPopBackResponse.cs → ...ing/Responses/CacheListPopBackResponse.cs
diff --git a/...ng/Responses/CacheListPopFrontResponse.cs → ...ng/Responses/CacheListPopFrontResponse.cs b/...ng/Responses/CacheListPopFrontResponse.cs → ...ng/Responses/CacheListPopFrontResponse.cs
diff --git a/...ng/Responses/CacheListPushBackResponse.cs → ...ng/Responses/CacheListPushBackResponse.cs b/...ng/Responses/CacheListPushBackResponse.cs → ...ng/Responses/CacheListPushBackResponse.cs
diff --git a/...g/Responses/CacheListPushFrontResponse.cs → ...g/Responses/CacheListPushFrontResponse.cs b/...g/Responses/CacheListPushFrontResponse.cs → ...g/Responses/CacheListPushFrontResponse.cs
diff --git a/...ing/Responses/CacheSetAddBatchResponse.cs → ...ing/Responses/CacheSetAddBatchResponse.cs b/...ing/Responses/CacheSetAddBatchResponse.cs → ...ing/Responses/CacheSetAddBatchResponse.cs
diff --git a/...cubating/Responses/CacheSetAddResponse.cs → ...cubating/Responses/CacheSetAddResponse.cs b/...cubating/Responses/CacheSetAddResponse.cs → ...cubating/Responses/CacheSetAddResponse.cs
diff --git a/...ating/Responses/CacheSetDeleteResponse.cs → ...ating/Responses/CacheSetDeleteResponse.cs b/...ating/Responses/CacheSetDeleteResponse.cs → ...ating/Responses/CacheSetDeleteResponse.cs
diff --git a/...bating/Responses/CacheSetFetchResponse.cs → ...bating/Responses/CacheSetFetchResponse.cs b/...bating/Responses/CacheSetFetchResponse.cs → ...bating/Responses/CacheSetFetchResponse.cs
diff --git a/...bating/Responses/CacheSetRemoveElement.cs → ...bating/Responses/CacheSetRemoveElement.cs b/...bating/Responses/CacheSetRemoveElement.cs → ...bating/Responses/CacheSetRemoveElement.cs
diff --git a/...ating/Responses/CacheSetRemoveElements.cs → ...ating/Responses/CacheSetRemoveElements.cs b/...ating/Responses/CacheSetRemoveElements.cs → ...ating/Responses/CacheSetRemoveElements.cs
diff --git a/Momento/Incubating/SimpleCacheClient.cs → ...mento.Sdk/Incubating/SimpleCacheClient.cs b/Momento/Incubating/SimpleCacheClient.cs → ...mento.Sdk/Incubating/SimpleCacheClient.cs
diff --git a/...to/Incubating/SimpleCacheClientFactory.cs → ...dk/Incubating/SimpleCacheClientFactory.cs b/...to/Incubating/SimpleCacheClientFactory.cs → ...dk/Incubating/SimpleCacheClientFactory.cs
diff --git a/Momento/Internal/ControlGrpcManager.cs → ...omento.Sdk/Internal/ControlGrpcManager.cs b/Momento/Internal/ControlGrpcManager.cs → ...omento.Sdk/Internal/ControlGrpcManager.cs
diff --git a/Momento/Internal/DataGrpcManager.cs → src/Momento.Sdk/Internal/DataGrpcManager.cs b/Momento/Internal/DataGrpcManager.cs → src/Momento.Sdk/Internal/DataGrpcManager.cs
diff --git a/Momento/Internal/HeaderInterceptor.cs → ...Momento.Sdk/Internal/HeaderInterceptor.cs b/Momento/Internal/HeaderInterceptor.cs → ...Momento.Sdk/Internal/HeaderInterceptor.cs
diff --git a/Momento/Internal/JwtUtils.cs → src/Momento.Sdk/Internal/JwtUtils.cs b/Momento/Internal/JwtUtils.cs → src/Momento.Sdk/Internal/JwtUtils.cs
diff --git a/Momento/Internal/ScsControlClient.cs → src/Momento.Sdk/Internal/ScsControlClient.cs b/Momento/Internal/ScsControlClient.cs → src/Momento.Sdk/Internal/ScsControlClient.cs
diff --git a/Momento/Internal/ScsDataClient.cs → src/Momento.Sdk/Internal/ScsDataClient.cs b/Momento/Internal/ScsDataClient.cs → src/Momento.Sdk/Internal/ScsDataClient.cs
diff --git a/Momento/Internal/Utils.cs → src/Momento.Sdk/Internal/Utils.cs b/Momento/Internal/Utils.cs → src/Momento.Sdk/Internal/Utils.cs
diff --git a/Momento/MomentoSdk.csproj → src/Momento.Sdk/Momento.Sdk.csproj b/Momento/MomentoSdk.csproj → src/Momento.Sdk/Momento.Sdk.csproj
@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<!-- Build Configuration -->
-		<AssemblyName>Momento.Sdk</AssemblyName>
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>

diff --git a/Momento/MomentoSigner.cs → src/Momento.Sdk/MomentoSigner.cs b/Momento/MomentoSigner.cs → src/Momento.Sdk/MomentoSigner.cs
diff --git a/Momento/Requests/SigningRequest.cs → src/Momento.Sdk/Requests/SigningRequest.cs b/Momento/Requests/SigningRequest.cs → src/Momento.Sdk/Requests/SigningRequest.cs
diff --git a/Momento/Responses/CacheDeleteResponse.cs → ...ento.Sdk/Responses/CacheDeleteResponse.cs b/Momento/Responses/CacheDeleteResponse.cs → ...ento.Sdk/Responses/CacheDeleteResponse.cs
diff --git a/Momento/Responses/CacheGetBatchResponse.cs → ...to.Sdk/Responses/CacheGetBatchResponse.cs b/Momento/Responses/CacheGetBatchResponse.cs → ...to.Sdk/Responses/CacheGetBatchResponse.cs
diff --git a/Momento/Responses/CacheGetResponse.cs → ...Momento.Sdk/Responses/CacheGetResponse.cs b/Momento/Responses/CacheGetResponse.cs → ...Momento.Sdk/Responses/CacheGetResponse.cs
diff --git a/Momento/Responses/CacheGetResponseBase.cs → ...nto.Sdk/Responses/CacheGetResponseBase.cs b/Momento/Responses/CacheGetResponseBase.cs → ...nto.Sdk/Responses/CacheGetResponseBase.cs
diff --git a/Momento/Responses/CacheGetStatus.cs → src/Momento.Sdk/Responses/CacheGetStatus.cs b/Momento/Responses/CacheGetStatus.cs → src/Momento.Sdk/Responses/CacheGetStatus.cs
diff --git a/Momento/Responses/CacheInfo.cs → src/Momento.Sdk/Responses/CacheInfo.cs b/Momento/Responses/CacheInfo.cs → src/Momento.Sdk/Responses/CacheInfo.cs
diff --git a/Momento/Responses/CacheSetBatchResponse.cs → ...to.Sdk/Responses/CacheSetBatchResponse.cs b/Momento/Responses/CacheSetBatchResponse.cs → ...to.Sdk/Responses/CacheSetBatchResponse.cs
diff --git a/Momento/Responses/CacheSetResponse.cs → ...Momento.Sdk/Responses/CacheSetResponse.cs b/Momento/Responses/CacheSetResponse.cs → ...Momento.Sdk/Responses/CacheSetResponse.cs
diff --git a/Momento/Responses/CreateCacheResponse.cs → ...ento.Sdk/Responses/CreateCacheResponse.cs b/Momento/Responses/CreateCacheResponse.cs → ...ento.Sdk/Responses/CreateCacheResponse.cs
diff --git a/Momento/Responses/DeleteCacheResponse.cs → ...ento.Sdk/Responses/DeleteCacheResponse.cs b/Momento/Responses/DeleteCacheResponse.cs → ...ento.Sdk/Responses/DeleteCacheResponse.cs
diff --git a/Momento/Responses/ListCachesResponse.cs → ...mento.Sdk/Responses/ListCachesResponse.cs b/Momento/Responses/ListCachesResponse.cs → ...mento.Sdk/Responses/ListCachesResponse.cs
diff --git a/Momento/SimpleCacheClient.cs → src/Momento.Sdk/SimpleCacheClient.cs b/Momento/SimpleCacheClient.cs → src/Momento.Sdk/SimpleCacheClient.cs
diff --git a/IncubatingIntegrationTest/DictionaryTest.cs → ...to.Sdk.Incubating.Tests/DictionaryTest.cs b/IncubatingIntegrationTest/DictionaryTest.cs → ...to.Sdk.Incubating.Tests/DictionaryTest.cs
@@ -1,7 +1,7 @@
 using Momento.Sdk.Internal.ExtensionMethods;
 using Momento.Sdk.Responses;
 
-namespace IncubatingIntegrationTest;
+namespace Momento.Sdk.Incubating.Tests;
 
 [Collection("SimpleCacheClient")]
 public class DictionaryTest : TestBase

diff --git a/IncubatingIntegrationTest/Fixtures.cs → .../Momento.Sdk.Incubating.Tests/Fixtures.cs b/IncubatingIntegrationTest/Fixtures.cs → .../Momento.Sdk.Incubating.Tests/Fixtures.cs
@@ -1,4 +1,4 @@
-namespace IncubatingIntegrationTest;
+namespace Momento.Sdk.Incubating.Tests;
 
 /// <summary>
 /// A cache client fixture.

diff --git a/IncubatingIntegrationTest/ListTest.cs → .../Momento.Sdk.Incubating.Tests/ListTest.cs b/IncubatingIntegrationTest/ListTest.cs → .../Momento.Sdk.Incubating.Tests/ListTest.cs
@@ -1,6 +1,6 @@
 using Momento.Sdk.Responses;
 
-namespace IncubatingIntegrationTest;
+namespace Momento.Sdk.Incubating.Tests;
 
 [Collection("SimpleCacheClient")]
 public class ListTest : TestBase

diff --git a/...tionTest/IncubatingIntegrationTest.csproj → ...Tests/Momento.Sdk.Incubating.Tests.csproj b/...tionTest/IncubatingIntegrationTest.csproj → ...Tests/Momento.Sdk.Incubating.Tests.csproj
@@ -21,6 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Momento\MomentoSdk.csproj" />
+    <ProjectReference Include="..\..\..\src\Momento.Sdk\Momento.Sdk.csproj" />
   </ItemGroup>
 </Project>
diff --git a/IncubatingIntegrationTest/SetTest.cs → ...n/Momento.Sdk.Incubating.Tests/SetTest.cs b/IncubatingIntegrationTest/SetTest.cs → ...n/Momento.Sdk.Incubating.Tests/SetTest.cs
@@ -1,6 +1,6 @@
 using Momento.Sdk.Responses;
 
-namespace IncubatingIntegrationTest;
+namespace Momento.Sdk.Incubating.Tests;
 
 [Collection("SimpleCacheClient")]
 public class SetTest : TestBase

diff --git a/IncubatingIntegrationTest/TestBase.cs → .../Momento.Sdk.Incubating.Tests/TestBase.cs b/IncubatingIntegrationTest/TestBase.cs → .../Momento.Sdk.Incubating.Tests/TestBase.cs
@@ -1,4 +1,4 @@
-namespace IncubatingIntegrationTest;
+namespace Momento.Sdk.Incubating.Tests;
 
 public class TestBase
 {

diff --git a/IncubatingIntegrationTest/Usings.cs → ...on/Momento.Sdk.Incubating.Tests/Usings.cs b/IncubatingIntegrationTest/Usings.cs → ...on/Momento.Sdk.Incubating.Tests/Usings.cs
diff --git a/MomentoIntegrationTest/Fixtures.cs → ...Integration/Momento.Sdk.Tests/Fixtures.cs b/MomentoIntegrationTest/Fixtures.cs → ...Integration/Momento.Sdk.Tests/Fixtures.cs
@@ -1,4 +1,4 @@
-namespace MomentoIntegrationTest;
+namespace Momento.Sdk.Tests;
 
 /// <summary>
 /// A cache client fixture.

diff --git a/...grationTest/MomentoIntegrationTest.csproj → ...omento.Sdk.Tests/Momento.Sdk.Tests.csproj b/...grationTest/MomentoIntegrationTest.csproj → ...omento.Sdk.Tests/Momento.Sdk.Tests.csproj
@@ -20,6 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Momento\MomentoSdk.csproj" />
+    <ProjectReference Include="..\..\..\src\Momento.Sdk\Momento.Sdk.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...IntegrationTest/SimpleCacheControlTest.cs → ...mento.Sdk.Tests/SimpleCacheControlTest.cs b/...IntegrationTest/SimpleCacheControlTest.cs → ...mento.Sdk.Tests/SimpleCacheControlTest.cs
@@ -1,7 +1,7 @@
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 
-namespace MomentoIntegrationTest;
+namespace Momento.Sdk.Tests;
 
 [Collection("SimpleCacheClient")]
 public class SimpleCacheControlTest

diff --git a/...ntoIntegrationTest/SimpleCacheDataTest.cs → .../Momento.Sdk.Tests/SimpleCacheDataTest.cs b/...ntoIntegrationTest/SimpleCacheDataTest.cs → .../Momento.Sdk.Tests/SimpleCacheDataTest.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MomentoIntegrationTest;
+namespace Momento.Sdk.Tests;
 
 [Collection("SimpleCacheClient")]
 public class SimpleCacheDataTest

diff --git a/MomentoIntegrationTest/Usings.cs → ...s/Integration/Momento.Sdk.Tests/Usings.cs b/MomentoIntegrationTest/Usings.cs → ...s/Integration/Momento.Sdk.Tests/Usings.cs
diff --git a/MomentoTest/MomentoTest.csproj → ...omento.Sdk.Tests/Momento.Sdk.Tests.csproj b/MomentoTest/MomentoTest.csproj → ...omento.Sdk.Tests/Momento.Sdk.Tests.csproj
@@ -20,6 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Momento\MomentoSdk.csproj" />
+    <ProjectReference Include="..\..\..\src\Momento.Sdk\Momento.Sdk.csproj" />
   </ItemGroup>
 </Project>
diff --git a/MomentoTest/MomentoSignerTest.cs → ...it/Momento.Sdk.Tests/MomentoSignerTest.cs b/MomentoTest/MomentoSignerTest.cs → ...it/Momento.Sdk.Tests/MomentoSignerTest.cs
@@ -7,7 +7,7 @@
 using Momento.Sdk.Requests;
 using Xunit;
 
-namespace MomentoTest;
+namespace Momento.Sdk.Tests;
 
 public class MomentoSignerTest
 {

diff --git a/...ntoTest/Responses/CacheGetResponseTest.cs → ...k.Tests/Responses/CacheGetResponseTest.cs b/...ntoTest/Responses/CacheGetResponseTest.cs → ...k.Tests/Responses/CacheGetResponseTest.cs
@@ -4,7 +4,7 @@
 using Momento.Sdk.Responses;
 using Xunit;
 
-namespace MomentoTest.Responses;
+namespace Momento.Sdk.Tests.Responses;
 
 public class CacheGetResponseTest
 {