diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml
index 36ad5df9..b58ec9d0 100644
--- a/.github/workflows/nuget-release.yml
+++ b/.github/workflows/nuget-release.yml
@@ -20,6 +20,6 @@ jobs:
         uses: brandedoutcast/publish-nuget@v2
         with:
           NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-          PROJECT_FILE_PATH: src/NRedisStack.Core/NRedisStack.Core.csproj
+          PROJECT_FILE_PATH: src/NRedisStack/NRedisStack.csproj
           PROJECT_NAME: NRedisStack
           TAG_COMMIT: false
diff --git a/NRedisStack.sln b/NRedisStack.sln
index d17a87aa..5ae2ad3e 100644
--- a/NRedisStack.sln
+++ b/NRedisStack.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack.Core", "src\NRedisStack.Core\NRedisStack.Core.csproj", "{6F5E84A5-DFC1-4747-AF7D-97BDAFA9102D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack", "src\NRedisStack\NRedisStack.csproj", "{6F5E84A5-DFC1-4747-AF7D-97BDAFA9102D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRedisStack.Tests", "tests\NRedisStack.Tests\NRedisStack.Tests.csproj", "{73B56C35-BC92-4ACD-B077-7D55CD67B95F}"
 EndProject
diff --git a/src/NRedisStack.Core/Auxiliary.cs b/src/NRedisStack/Auxiliary.cs
similarity index 92%
rename from src/NRedisStack.Core/Auxiliary.cs
rename to src/NRedisStack/Auxiliary.cs
index 2e4b53e5..365e97e2 100644
--- a/src/NRedisStack.Core/Auxiliary.cs
+++ b/src/NRedisStack/Auxiliary.cs
@@ -1,6 +1,6 @@
 using StackExchange.Redis;
 
-namespace NRedisStack.Core
+namespace NRedisStack
 {
     public static class Auxiliary
     {
diff --git a/src/NRedisStack.Core/Bloom/BloomCommands.cs b/src/NRedisStack/Bloom/BloomCommands.cs
similarity index 99%
rename from src/NRedisStack.Core/Bloom/BloomCommands.cs
rename to src/NRedisStack/Bloom/BloomCommands.cs
index a121a6e0..c627f36e 100644
--- a/src/NRedisStack.Core/Bloom/BloomCommands.cs
+++ b/src/NRedisStack/Bloom/BloomCommands.cs
@@ -1,7 +1,7 @@
-using NRedisStack.Core.Bloom.DataTypes;
-using NRedisStack.Core.Literals;
+using NRedisStack.Bloom.DataTypes;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
 
     public class BloomCommands
diff --git a/src/NRedisStack.Core/Bloom/DataTypes/BloomInformation.cs b/src/NRedisStack/Bloom/DataTypes/BloomInformation.cs
similarity index 95%
rename from src/NRedisStack.Core/Bloom/DataTypes/BloomInformation.cs
rename to src/NRedisStack/Bloom/DataTypes/BloomInformation.cs
index a54a0643..082efc21 100644
--- a/src/NRedisStack.Core/Bloom/DataTypes/BloomInformation.cs
+++ b/src/NRedisStack/Bloom/DataTypes/BloomInformation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Bloom.DataTypes
+namespace NRedisStack.Bloom.DataTypes
 {
     /// <summary>
     /// This class represents the response for BF.INFO command.
diff --git a/src/NRedisStack.Core/Bloom/Literals/CommandArgs.cs b/src/NRedisStack/Bloom/Literals/CommandArgs.cs
similarity index 90%
rename from src/NRedisStack.Core/Bloom/Literals/CommandArgs.cs
rename to src/NRedisStack/Bloom/Literals/CommandArgs.cs
index 02958eb1..b86fd67d 100644
--- a/src/NRedisStack.Core/Bloom/Literals/CommandArgs.cs
+++ b/src/NRedisStack/Bloom/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class BloomArgs
     {
diff --git a/src/NRedisStack.Core/Bloom/Literals/Commands.cs b/src/NRedisStack/Bloom/Literals/Commands.cs
similarity index 92%
rename from src/NRedisStack.Core/Bloom/Literals/Commands.cs
rename to src/NRedisStack/Bloom/Literals/Commands.cs
index f9b07416..d664647f 100644
--- a/src/NRedisStack.Core/Bloom/Literals/Commands.cs
+++ b/src/NRedisStack/Bloom/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class BF
     {
diff --git a/src/NRedisStack.Core/CountMinSketch/CmsCommands.cs b/src/NRedisStack/CountMinSketch/CmsCommands.cs
similarity index 99%
rename from src/NRedisStack.Core/CountMinSketch/CmsCommands.cs
rename to src/NRedisStack/CountMinSketch/CmsCommands.cs
index a1e7366b..b25e672d 100644
--- a/src/NRedisStack.Core/CountMinSketch/CmsCommands.cs
+++ b/src/NRedisStack/CountMinSketch/CmsCommands.cs
@@ -1,7 +1,7 @@
-using NRedisStack.Core.CountMinSketch.DataTypes;
-using NRedisStack.Core.Literals;
+using NRedisStack.CountMinSketch.DataTypes;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
 
     public class CmsCommands
diff --git a/src/NRedisStack.Core/CountMinSketch/DataTypes/CmsInformation.cs b/src/NRedisStack/CountMinSketch/DataTypes/CmsInformation.cs
similarity index 91%
rename from src/NRedisStack.Core/CountMinSketch/DataTypes/CmsInformation.cs
rename to src/NRedisStack/CountMinSketch/DataTypes/CmsInformation.cs
index da7c7c7b..cb97b5e4 100644
--- a/src/NRedisStack.Core/CountMinSketch/DataTypes/CmsInformation.cs
+++ b/src/NRedisStack/CountMinSketch/DataTypes/CmsInformation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.CountMinSketch.DataTypes
+namespace NRedisStack.CountMinSketch.DataTypes
 {
     /// <summary>
     /// This class represents the response for CMS.INFO command.
diff --git a/src/NRedisStack.Core/CountMinSketch/Literals/CommandArgs.cs b/src/NRedisStack/CountMinSketch/Literals/CommandArgs.cs
similarity index 92%
rename from src/NRedisStack.Core/CountMinSketch/Literals/CommandArgs.cs
rename to src/NRedisStack/CountMinSketch/Literals/CommandArgs.cs
index c350eae9..bab74ae9 100644
--- a/src/NRedisStack.Core/CountMinSketch/Literals/CommandArgs.cs
+++ b/src/NRedisStack/CountMinSketch/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class CmsArgs
     {
diff --git a/src/NRedisStack.Core/CountMinSketch/Literals/Commands.cs b/src/NRedisStack/CountMinSketch/Literals/Commands.cs
similarity index 90%
rename from src/NRedisStack.Core/CountMinSketch/Literals/Commands.cs
rename to src/NRedisStack/CountMinSketch/Literals/Commands.cs
index a1e16ac8..1a0517e5 100644
--- a/src/NRedisStack.Core/CountMinSketch/Literals/Commands.cs
+++ b/src/NRedisStack/CountMinSketch/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class CMS
     {
diff --git a/src/NRedisStack.Core/CuckooFilter/CuckooCommands.cs b/src/NRedisStack/CuckooFilter/CuckooCommands.cs
similarity index 99%
rename from src/NRedisStack.Core/CuckooFilter/CuckooCommands.cs
rename to src/NRedisStack/CuckooFilter/CuckooCommands.cs
index 32300829..79dc9def 100644
--- a/src/NRedisStack.Core/CuckooFilter/CuckooCommands.cs
+++ b/src/NRedisStack/CuckooFilter/CuckooCommands.cs
@@ -1,7 +1,7 @@
-using NRedisStack.Core.CuckooFilter.DataTypes;
-using NRedisStack.Core.Literals;
+using NRedisStack.CuckooFilter.DataTypes;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
 
     public class CuckooCommands
diff --git a/src/NRedisStack.Core/CuckooFilter/DataTypes/CuckooInformation.cs b/src/NRedisStack/CuckooFilter/DataTypes/CuckooInformation.cs
similarity index 96%
rename from src/NRedisStack.Core/CuckooFilter/DataTypes/CuckooInformation.cs
rename to src/NRedisStack/CuckooFilter/DataTypes/CuckooInformation.cs
index aa7d9b29..cb5d31ae 100644
--- a/src/NRedisStack.Core/CuckooFilter/DataTypes/CuckooInformation.cs
+++ b/src/NRedisStack/CuckooFilter/DataTypes/CuckooInformation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.CuckooFilter.DataTypes
+namespace NRedisStack.CuckooFilter.DataTypes
 {
     /// <summary>
     /// This class represents the response for CF.INFO command.
diff --git a/src/NRedisStack.Core/CuckooFilter/Literals/CommandArgs.cs b/src/NRedisStack/CuckooFilter/Literals/CommandArgs.cs
similarity index 91%
rename from src/NRedisStack.Core/CuckooFilter/Literals/CommandArgs.cs
rename to src/NRedisStack/CuckooFilter/Literals/CommandArgs.cs
index cb7462d5..1d144237 100644
--- a/src/NRedisStack.Core/CuckooFilter/Literals/CommandArgs.cs
+++ b/src/NRedisStack/CuckooFilter/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class CuckooArgs
     {
diff --git a/src/NRedisStack.Core/CuckooFilter/Literals/Commands.cs b/src/NRedisStack/CuckooFilter/Literals/Commands.cs
similarity index 94%
rename from src/NRedisStack.Core/CuckooFilter/Literals/Commands.cs
rename to src/NRedisStack/CuckooFilter/Literals/Commands.cs
index 8dd2b134..e79b03cc 100644
--- a/src/NRedisStack.Core/CuckooFilter/Literals/Commands.cs
+++ b/src/NRedisStack/CuckooFilter/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class CF
     {
diff --git a/src/NRedisStack.Core/Json/JsonCommands.cs b/src/NRedisStack/Json/JsonCommands.cs
similarity index 96%
rename from src/NRedisStack.Core/Json/JsonCommands.cs
rename to src/NRedisStack/Json/JsonCommands.cs
index 63ac9ab8..7782408d 100644
--- a/src/NRedisStack.Core/Json/JsonCommands.cs
+++ b/src/NRedisStack/Json/JsonCommands.cs
@@ -1,9 +1,9 @@
-using NRedisStack.Core.Literals;
+using NRedisStack.Literals;
 using StackExchange.Redis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace NRedisStack.Core;
+namespace NRedisStack;
 
 public class JsonCommands
 {
diff --git a/src/NRedisStack.Core/Json/Literals/CommandArgs.cs b/src/NRedisStack/Json/Literals/CommandArgs.cs
similarity index 84%
rename from src/NRedisStack.Core/Json/Literals/CommandArgs.cs
rename to src/NRedisStack/Json/Literals/CommandArgs.cs
index 394ea0f0..3403b53f 100644
--- a/src/NRedisStack.Core/Json/Literals/CommandArgs.cs
+++ b/src/NRedisStack/Json/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class JsonArgs
     {
diff --git a/src/NRedisStack.Core/Json/Literals/Commands.cs b/src/NRedisStack/Json/Literals/Commands.cs
similarity index 97%
rename from src/NRedisStack.Core/Json/Literals/Commands.cs
rename to src/NRedisStack/Json/Literals/Commands.cs
index b7606163..b0f267d6 100644
--- a/src/NRedisStack.Core/Json/Literals/Commands.cs
+++ b/src/NRedisStack/Json/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class JSON
     {
diff --git a/src/NRedisStack.Core/ModulPrefixes.cs b/src/NRedisStack/ModulPrefixes.cs
similarity index 98%
rename from src/NRedisStack.Core/ModulPrefixes.cs
rename to src/NRedisStack/ModulPrefixes.cs
index 7470395d..bf76c002 100644
--- a/src/NRedisStack.Core/ModulPrefixes.cs
+++ b/src/NRedisStack/ModulPrefixes.cs
@@ -1,6 +1,6 @@
 using StackExchange.Redis;
 
-namespace NRedisStack.Core.RedisStackCommands
+namespace NRedisStack.RedisStackCommands
 {
     public static class ModulPrefixes
     {
diff --git a/src/NRedisStack.Core/NRedisStack.Core.csproj b/src/NRedisStack/NRedisStack.csproj
similarity index 100%
rename from src/NRedisStack.Core/NRedisStack.Core.csproj
rename to src/NRedisStack/NRedisStack.csproj
diff --git a/src/NRedisStack.Core/ResponseParser.cs b/src/NRedisStack/ResponseParser.cs
similarity index 98%
rename from src/NRedisStack.Core/ResponseParser.cs
rename to src/NRedisStack/ResponseParser.cs
index 4cfe4427..54001dec 100644
--- a/src/NRedisStack.Core/ResponseParser.cs
+++ b/src/NRedisStack/ResponseParser.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
-using NRedisStack.Core.Literals.Enums;
-using NRedisStack.Core.DataTypes;
-using NRedisStack.Core.Extensions;
+using NRedisStack.Literals.Enums;
+using NRedisStack.DataTypes;
+using NRedisStack.Extensions;
 using StackExchange.Redis;
-using NRedisStack.Core.Bloom.DataTypes;
-using NRedisStack.Core.CuckooFilter.DataTypes;
-using NRedisStack.Core.CountMinSketch.DataTypes;
-using NRedisStack.Core.TopK.DataTypes;
-using NRedisStack.Core.Tdigest.DataTypes;
+using NRedisStack.Bloom.DataTypes;
+using NRedisStack.CuckooFilter.DataTypes;
+using NRedisStack.CountMinSketch.DataTypes;
+using NRedisStack.TopK.DataTypes;
+using NRedisStack.Tdigest.DataTypes;
 
-namespace NRedisStack.Core
+namespace NRedisStack
 {
     public static class ResponseParser
     {
diff --git a/src/NRedisStack.Core/Search/Literals/CommandArgs.cs b/src/NRedisStack/Search/Literals/CommandArgs.cs
similarity index 56%
rename from src/NRedisStack.Core/Search/Literals/CommandArgs.cs
rename to src/NRedisStack/Search/Literals/CommandArgs.cs
index e9a66846..48e36a47 100644
--- a/src/NRedisStack.Core/Search/Literals/CommandArgs.cs
+++ b/src/NRedisStack/Search/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class SearchArgs
     {
diff --git a/src/NRedisStack.Core/Search/Literals/Commands.cs b/src/NRedisStack/Search/Literals/Commands.cs
similarity index 97%
rename from src/NRedisStack.Core/Search/Literals/Commands.cs
rename to src/NRedisStack/Search/Literals/Commands.cs
index da00baac..595f6912 100644
--- a/src/NRedisStack.Core/Search/Literals/Commands.cs
+++ b/src/NRedisStack/Search/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class FT
     {
diff --git a/src/NRedisStack.Core/Search/SearchCommands.cs b/src/NRedisStack/Search/SearchCommands.cs
similarity index 83%
rename from src/NRedisStack.Core/Search/SearchCommands.cs
rename to src/NRedisStack/Search/SearchCommands.cs
index 63fa5bcd..875bb43b 100644
--- a/src/NRedisStack.Core/Search/SearchCommands.cs
+++ b/src/NRedisStack/Search/SearchCommands.cs
@@ -1,6 +1,6 @@
-using NRedisStack.Core.Literals;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
     public class SearchCommands
     {
diff --git a/src/NRedisStack.Core/Tdigest/DataTypes/TdigestInformation.cs b/src/NRedisStack/Tdigest/DataTypes/TdigestInformation.cs
similarity index 96%
rename from src/NRedisStack.Core/Tdigest/DataTypes/TdigestInformation.cs
rename to src/NRedisStack/Tdigest/DataTypes/TdigestInformation.cs
index f091eacc..fdd39b06 100644
--- a/src/NRedisStack.Core/Tdigest/DataTypes/TdigestInformation.cs
+++ b/src/NRedisStack/Tdigest/DataTypes/TdigestInformation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Tdigest.DataTypes
+namespace NRedisStack.Tdigest.DataTypes
 {
     /// <summary>
     /// This class represents the response for TDIGEST.INFO command.
diff --git a/src/NRedisStack.Core/Tdigest/Literals/CommandArgs.cs b/src/NRedisStack/Tdigest/Literals/CommandArgs.cs
similarity index 74%
rename from src/NRedisStack.Core/Tdigest/Literals/CommandArgs.cs
rename to src/NRedisStack/Tdigest/Literals/CommandArgs.cs
index 14e37bbf..ffcbfd00 100644
--- a/src/NRedisStack.Core/Tdigest/Literals/CommandArgs.cs
+++ b/src/NRedisStack/Tdigest/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TdigestArgs
     {
diff --git a/src/NRedisStack.Core/Tdigest/Literals/Commands.cs b/src/NRedisStack/Tdigest/Literals/Commands.cs
similarity index 94%
rename from src/NRedisStack.Core/Tdigest/Literals/Commands.cs
rename to src/NRedisStack/Tdigest/Literals/Commands.cs
index d4633f3c..7baf2431 100644
--- a/src/NRedisStack.Core/Tdigest/Literals/Commands.cs
+++ b/src/NRedisStack/Tdigest/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TDIGEST
     {
diff --git a/src/NRedisStack.Core/Tdigest/TdigestCommands.cs b/src/NRedisStack/Tdigest/TdigestCommands.cs
similarity index 99%
rename from src/NRedisStack.Core/Tdigest/TdigestCommands.cs
rename to src/NRedisStack/Tdigest/TdigestCommands.cs
index 3e61cfac..27b4dcde 100644
--- a/src/NRedisStack.Core/Tdigest/TdigestCommands.cs
+++ b/src/NRedisStack/Tdigest/TdigestCommands.cs
@@ -1,7 +1,7 @@
-using NRedisStack.Core.Tdigest.DataTypes;
-using NRedisStack.Core.Literals;
+using NRedisStack.Tdigest.DataTypes;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
 
     public class TdigestCommands
diff --git a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesInformation.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesInformation.cs
similarity index 97%
rename from src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesInformation.cs
rename to src/NRedisStack/TimeSeries/DataTypes/TimeSeriesInformation.cs
index abcddb18..71b428fb 100644
--- a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesInformation.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesInformation.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Text.Json;
 using System.Collections.Generic;
-using NRedisStack.Core.Literals.Enums;
+using NRedisStack.Literals.Enums;
 
 
-namespace NRedisStack.Core.DataTypes
+namespace NRedisStack.DataTypes
 {
     /// <summary>
     /// This class represents the response for TS.INFO command.
diff --git a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesLabel.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesLabel.cs
similarity index 98%
rename from src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesLabel.cs
rename to src/NRedisStack/TimeSeries/DataTypes/TimeSeriesLabel.cs
index f65d7dcf..1629c9da 100644
--- a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesLabel.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesLabel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NRedisStack.Core.DataTypes
+namespace NRedisStack.DataTypes
 {
     /// <summary>
     /// A key-value pair class represetns metadata label of time-series.
diff --git a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesRule.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesRule.cs
similarity index 95%
rename from src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesRule.cs
rename to src/NRedisStack/TimeSeries/DataTypes/TimeSeriesRule.cs
index aeb547f8..04e7450e 100644
--- a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesRule.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesRule.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using NRedisStack.Core.Literals.Enums;
-using NRedisStack.Core.Extensions;
+using NRedisStack.Literals.Enums;
+using NRedisStack.Extensions;
 
-namespace NRedisStack.Core.DataTypes
+namespace NRedisStack.DataTypes
 {
     /// <summary>
     /// A class that represents time-series aggregation rule.
diff --git a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesTuple.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesTuple.cs
similarity index 98%
rename from src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesTuple.cs
rename to src/NRedisStack/TimeSeries/DataTypes/TimeSeriesTuple.cs
index c053f724..e11e298b 100644
--- a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeSeriesTuple.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeSeriesTuple.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NRedisStack.Core.DataTypes
+namespace NRedisStack.DataTypes
 {
     /// <summary>
     /// A class represents time-series timestamp-value pair
diff --git a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeStamp.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
similarity index 99%
rename from src/NRedisStack.Core/TimeSeries/DataTypes/TimeStamp.cs
rename to src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
index d75b4cf2..69b17ba5 100644
--- a/src/NRedisStack.Core/TimeSeries/DataTypes/TimeStamp.cs
+++ b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NRedisStack.Core.DataTypes
+namespace NRedisStack.DataTypes
 {
     /// <summary>
     /// A class represents timestamp.
diff --git a/src/NRedisStack.Core/TimeSeries/Extensions/AggregationExtensions.cs b/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
similarity index 95%
rename from src/NRedisStack.Core/TimeSeries/Extensions/AggregationExtensions.cs
rename to src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
index be10aa04..3a44819d 100644
--- a/src/NRedisStack.Core/TimeSeries/Extensions/AggregationExtensions.cs
+++ b/src/NRedisStack/TimeSeries/Extensions/AggregationExtensions.cs
@@ -1,7 +1,7 @@
 using System;
-using NRedisStack.Core.Literals.Enums;
+using NRedisStack.Literals.Enums;
 
-namespace NRedisStack.Core.Extensions
+namespace NRedisStack.Extensions
 {
     internal static class AggregationExtensions
     {
diff --git a/src/NRedisStack.Core/TimeSeries/Extensions/DuplicatePolicyExtensions.cs b/src/NRedisStack/TimeSeries/Extensions/DuplicatePolicyExtensions.cs
similarity index 93%
rename from src/NRedisStack.Core/TimeSeries/Extensions/DuplicatePolicyExtensions.cs
rename to src/NRedisStack/TimeSeries/Extensions/DuplicatePolicyExtensions.cs
index 555d9169..efc16083 100644
--- a/src/NRedisStack.Core/TimeSeries/Extensions/DuplicatePolicyExtensions.cs
+++ b/src/NRedisStack/TimeSeries/Extensions/DuplicatePolicyExtensions.cs
@@ -1,7 +1,7 @@
 using System;
-using NRedisStack.Core.Literals.Enums;
+using NRedisStack.Literals.Enums;
 
-namespace NRedisStack.Core.Extensions
+namespace NRedisStack.Extensions
 {
     internal static class DuplicatePolicyExtensions
     {
diff --git a/src/NRedisStack.Core/TimeSeries/Extensions/ReduceExtensions.cs b/src/NRedisStack/TimeSeries/Extensions/ReduceExtensions.cs
similarity index 89%
rename from src/NRedisStack.Core/TimeSeries/Extensions/ReduceExtensions.cs
rename to src/NRedisStack/TimeSeries/Extensions/ReduceExtensions.cs
index 7cbf6f0f..005920c0 100644
--- a/src/NRedisStack.Core/TimeSeries/Extensions/ReduceExtensions.cs
+++ b/src/NRedisStack/TimeSeries/Extensions/ReduceExtensions.cs
@@ -1,7 +1,7 @@
 using System;
-using NRedisStack.Core.Literals.Enums;
+using NRedisStack.Literals.Enums;
 
-namespace NRedisStack.Core.Extensions
+namespace NRedisStack.Extensions
 {
     internal static class ReduceExtensions
     {
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/CommandArgs.cs b/src/NRedisStack/TimeSeries/Literals/CommandArgs.cs
similarity index 96%
rename from src/NRedisStack.Core/TimeSeries/Literals/CommandArgs.cs
rename to src/NRedisStack/TimeSeries/Literals/CommandArgs.cs
index 54a541bf..2aee5ef0 100644
--- a/src/NRedisStack.Core/TimeSeries/Literals/CommandArgs.cs
+++ b/src/NRedisStack/TimeSeries/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TimeSeriesArgs
     {
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/Commands.cs b/src/NRedisStack/TimeSeries/Literals/Commands.cs
similarity index 95%
rename from src/NRedisStack.Core/TimeSeries/Literals/Commands.cs
rename to src/NRedisStack/TimeSeries/Literals/Commands.cs
index abc930a4..e288cf44 100644
--- a/src/NRedisStack.Core/TimeSeries/Literals/Commands.cs
+++ b/src/NRedisStack/TimeSeries/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TS
     {
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/Enums/Aggregation.cs b/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
similarity index 97%
rename from src/NRedisStack.Core/TimeSeries/Literals/Enums/Aggregation.cs
rename to src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
index 88dcb3f1..b6a2af60 100644
--- a/src/NRedisStack.Core/TimeSeries/Literals/Enums/Aggregation.cs
+++ b/src/NRedisStack/TimeSeries/Literals/Enums/Aggregation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals.Enums
+namespace NRedisStack.Literals.Enums
 {
     /// <summary>
     /// An aggregation type to be used with a time bucket.
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/Enums/DuplicatePolicy.cs b/src/NRedisStack/TimeSeries/Literals/Enums/DuplicatePolicy.cs
similarity index 96%
rename from src/NRedisStack.Core/TimeSeries/Literals/Enums/DuplicatePolicy.cs
rename to src/NRedisStack/TimeSeries/Literals/Enums/DuplicatePolicy.cs
index e81b9b04..2400bd43 100644
--- a/src/NRedisStack.Core/TimeSeries/Literals/Enums/DuplicatePolicy.cs
+++ b/src/NRedisStack/TimeSeries/Literals/Enums/DuplicatePolicy.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals.Enums
+namespace NRedisStack.Literals.Enums
 {
     /// <summary>
     /// Policy to handle duplicate samples.
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/Enums/Reduce.cs b/src/NRedisStack/TimeSeries/Literals/Enums/Reduce.cs
similarity index 91%
rename from src/NRedisStack.Core/TimeSeries/Literals/Enums/Reduce.cs
rename to src/NRedisStack/TimeSeries/Literals/Enums/Reduce.cs
index c81e4433..a716dec7 100644
--- a/src/NRedisStack.Core/TimeSeries/Literals/Enums/Reduce.cs
+++ b/src/NRedisStack/TimeSeries/Literals/Enums/Reduce.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals.Enums
+namespace NRedisStack.Literals.Enums
 {
     /// <summary>
     /// TODO: Add description
diff --git a/src/NRedisStack.Core/TimeSeries/TimeSeriesAux.cs b/src/NRedisStack/TimeSeries/TimeSeriesAux.cs
similarity index 98%
rename from src/NRedisStack.Core/TimeSeries/TimeSeriesAux.cs
rename to src/NRedisStack/TimeSeries/TimeSeriesAux.cs
index 24acd167..9073f2f2 100644
--- a/src/NRedisStack.Core/TimeSeries/TimeSeriesAux.cs
+++ b/src/NRedisStack/TimeSeries/TimeSeriesAux.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using NRedisStack.Core.Literals;
-using NRedisStack.Core.Literals.Enums;
-using NRedisStack.Core.DataTypes;
-using NRedisStack.Core.Extensions;
+using NRedisStack.Literals;
+using NRedisStack.Literals.Enums;
+using NRedisStack.DataTypes;
+using NRedisStack.Extensions;
 
-namespace NRedisStack.Core
+namespace NRedisStack
 {
     public static class TimeSeriesAux
     {
diff --git a/src/NRedisStack.Core/TimeSeries/TimeSeriesCommands.cs b/src/NRedisStack/TimeSeries/TimeSeriesCommands.cs
similarity index 89%
rename from src/NRedisStack.Core/TimeSeries/TimeSeriesCommands.cs
rename to src/NRedisStack/TimeSeries/TimeSeriesCommands.cs
index c728b28c..d15e641e 100644
--- a/src/NRedisStack.Core/TimeSeries/TimeSeriesCommands.cs
+++ b/src/NRedisStack/TimeSeries/TimeSeriesCommands.cs
@@ -1,10 +1,10 @@
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
-using NRedisStack.Core.Literals;
-using NRedisStack.Core.Literals.Enums;
-using NRedisStack.Core.DataTypes;
-namespace NRedisStack.Core
+using NRedisStack.Literals;
+using NRedisStack.Literals.Enums;
+using NRedisStack.DataTypes;
+namespace NRedisStack
 {
     public class TimeSeriesCommands
     {
diff --git a/src/NRedisStack.Core/TopK/DataTypes/TopKInformation.cs b/src/NRedisStack/TopK/DataTypes/TopKInformation.cs
similarity index 93%
rename from src/NRedisStack.Core/TopK/DataTypes/TopKInformation.cs
rename to src/NRedisStack/TopK/DataTypes/TopKInformation.cs
index eb6b5d2d..03aae74d 100644
--- a/src/NRedisStack.Core/TopK/DataTypes/TopKInformation.cs
+++ b/src/NRedisStack/TopK/DataTypes/TopKInformation.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.TopK.DataTypes
+namespace NRedisStack.TopK.DataTypes
 {
     /// <summary>
     /// This class represents the response for TOPK.INFO command.
diff --git a/src/NRedisStack.Core/TopK/Literals/CommandArgs.cs b/src/NRedisStack/TopK/Literals/CommandArgs.cs
similarity index 78%
rename from src/NRedisStack.Core/TopK/Literals/CommandArgs.cs
rename to src/NRedisStack/TopK/Literals/CommandArgs.cs
index 0844e5dd..3c0c73e9 100644
--- a/src/NRedisStack.Core/TopK/Literals/CommandArgs.cs
+++ b/src/NRedisStack/TopK/Literals/CommandArgs.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TopKArgs
     {
diff --git a/src/NRedisStack.Core/TopK/Literals/Commands.cs b/src/NRedisStack/TopK/Literals/Commands.cs
similarity index 91%
rename from src/NRedisStack.Core/TopK/Literals/Commands.cs
rename to src/NRedisStack/TopK/Literals/Commands.cs
index 910c1d0b..a9aa8912 100644
--- a/src/NRedisStack.Core/TopK/Literals/Commands.cs
+++ b/src/NRedisStack/TopK/Literals/Commands.cs
@@ -1,4 +1,4 @@
-namespace NRedisStack.Core.Literals
+namespace NRedisStack.Literals
 {
     internal class TOPK
     {
diff --git a/src/NRedisStack.Core/TopK/TopKCommands.cs b/src/NRedisStack/TopK/TopKCommands.cs
similarity index 99%
rename from src/NRedisStack.Core/TopK/TopKCommands.cs
rename to src/NRedisStack/TopK/TopKCommands.cs
index 80e40345..71cba07b 100644
--- a/src/NRedisStack.Core/TopK/TopKCommands.cs
+++ b/src/NRedisStack/TopK/TopKCommands.cs
@@ -1,7 +1,7 @@
-using NRedisStack.Core.TopK.DataTypes;
-using NRedisStack.Core.Literals;
+using NRedisStack.TopK.DataTypes;
+using NRedisStack.Literals;
 using StackExchange.Redis;
-namespace NRedisStack.Core
+namespace NRedisStack
 {
 
     public class TopKCommands
diff --git a/tests/NRedisStack.Tests/Bloom/BloomTests.cs b/tests/NRedisStack.Tests/Bloom/BloomTests.cs
index 52c85498..f9c6ce6f 100644
--- a/tests/NRedisStack.Tests/Bloom/BloomTests.cs
+++ b/tests/NRedisStack.Tests/Bloom/BloomTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 namespace NRedisStack.Tests.Bloom;
diff --git a/tests/NRedisStack.Tests/CountMinSketch/CmsTests.cs b/tests/NRedisStack.Tests/CountMinSketch/CmsTests.cs
index f2b3a8ef..2487ac4d 100644
--- a/tests/NRedisStack.Tests/CountMinSketch/CmsTests.cs
+++ b/tests/NRedisStack.Tests/CountMinSketch/CmsTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 namespace NRedisStack.Tests.CuckooFilter;
diff --git a/tests/NRedisStack.Tests/CuckooFilter/CuckooTests.cs b/tests/NRedisStack.Tests/CuckooFilter/CuckooTests.cs
index 0c3f2ce9..1c8c1605 100644
--- a/tests/NRedisStack.Tests/CuckooFilter/CuckooTests.cs
+++ b/tests/NRedisStack.Tests/CuckooFilter/CuckooTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 namespace NRedisStack.Tests.CuckooFilter;
diff --git a/tests/NRedisStack.Tests/Json/JsonTests.cs b/tests/NRedisStack.Tests/Json/JsonTests.cs
index 443efcf7..2f65a0eb 100644
--- a/tests/NRedisStack.Tests/Json/JsonTests.cs
+++ b/tests/NRedisStack.Tests/Json/JsonTests.cs
@@ -1,7 +1,7 @@
 using Xunit;
 using StackExchange.Redis;
 using Moq;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 
 
 namespace NRedisStack.Tests;
diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj
index 900de8c3..80674304 100644
--- a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj
+++ b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\NRedisStack.Core\NRedisStack.Core.csproj" />
+    <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/NRedisStack.Tests/Search/SearchTests.cs b/tests/NRedisStack.Tests/Search/SearchTests.cs
index e0a84a0f..dd1ec794 100644
--- a/tests/NRedisStack.Tests/Search/SearchTests.cs
+++ b/tests/NRedisStack.Tests/Search/SearchTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 
diff --git a/tests/NRedisStack.Tests/Tdigest/TdigestTests.cs b/tests/NRedisStack.Tests/Tdigest/TdigestTests.cs
index 337e38f3..dc2ccdb8 100644
--- a/tests/NRedisStack.Tests/Tdigest/TdigestTests.cs
+++ b/tests/NRedisStack.Tests/Tdigest/TdigestTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 namespace NRedisStack.Tests.Tdigest;
diff --git a/tests/NRedisStack.Tests/TimeSeries/TimeSeriesTests.cs b/tests/NRedisStack.Tests/TimeSeries/TimeSeriesTests.cs
index 72521cf9..ea7720b2 100644
--- a/tests/NRedisStack.Tests/TimeSeries/TimeSeriesTests.cs
+++ b/tests/NRedisStack.Tests/TimeSeries/TimeSeriesTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 
diff --git a/tests/NRedisStack.Tests/TopK/TopKTests.cs b/tests/NRedisStack.Tests/TopK/TopKTests.cs
index dc134517..98e6c5ed 100644
--- a/tests/NRedisStack.Tests/TopK/TopKTests.cs
+++ b/tests/NRedisStack.Tests/TopK/TopKTests.cs
@@ -1,6 +1,6 @@
 using Xunit;
 using StackExchange.Redis;
-using NRedisStack.Core.RedisStackCommands;
+using NRedisStack.RedisStackCommands;
 using Moq;
 
 namespace NRedisStack.Tests.TopK;