diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs
index 9cf689a..d495ce3 100644
--- a/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs
+++ b/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs
@@ -1,7 +1,7 @@
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.Grpc.Protocol.Columnar;
+using Couchbase.Core.Json;
 using Google.Protobuf.Collections;
 using Google.Protobuf.WellKnownTypes;
 using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;
diff --git a/src/Couchbase.Analytics/Internal/AnalyticsService.cs b/src/Couchbase.Analytics/Internal/AnalyticsService.cs
index 32cedea..c9dba2e 100644
--- a/src/Couchbase.Analytics/Internal/AnalyticsService.cs
+++ b/src/Couchbase.Analytics/Internal/AnalyticsService.cs
@@ -25,9 +25,9 @@
 using Couchbase.AnalyticsClient.Internal.HTTP;
 using Couchbase.AnalyticsClient.Internal.Results;
 using Couchbase.AnalyticsClient.Internal.Retry;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Results;
+using Couchbase.Core.Json;
 using Couchbase.Core.Utils;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
index 65c0642..f970e79 100644
--- a/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
+++ b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
@@ -21,7 +21,7 @@
 
 using System.Text.Json;
 using Couchbase.AnalyticsClient.Internal.HTTP;
-using Couchbase.AnalyticsClient.Json;
+using Couchbase.Core.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
diff --git a/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
index 95920ca..b80875e 100644
--- a/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
+++ b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
@@ -20,9 +20,9 @@
 #endregion
 
 using System.Net;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
+using Couchbase.Core.Json;
 
 namespace Couchbase.AnalyticsClient.Internal.Results;
 
diff --git a/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
index 0f85a96..5e3c0f5 100644
--- a/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
+++ b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
@@ -20,7 +20,6 @@
 #endregion
 
 using System.Runtime.CompilerServices;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
diff --git a/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
index 65c5f63..027579e 100644
--- a/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
+++ b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
@@ -20,7 +20,6 @@
 #endregion
 
 using System.Runtime.CompilerServices;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
 using Couchbase.Core.Json;
diff --git a/src/Couchbase.Analytics/Options/ClusterOptions.cs b/src/Couchbase.Analytics/Options/ClusterOptions.cs
index 22bf164..a89e710 100644
--- a/src/Couchbase.Analytics/Options/ClusterOptions.cs
+++ b/src/Couchbase.Analytics/Options/ClusterOptions.cs
@@ -26,7 +26,7 @@
 using Couchbase.AnalyticsClient.Internal;
 using Couchbase.AnalyticsClient.Internal.DI;
 using Couchbase.AnalyticsClient.Internal.Utils;
-using Couchbase.AnalyticsClient.Json;
+using Couchbase.Core.Json;
 using Couchbase.Core.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/src/Couchbase.Analytics/Options/QueryOptions.cs b/src/Couchbase.Analytics/Options/QueryOptions.cs
index 05f8a37..26939cd 100644
--- a/src/Couchbase.Analytics/Options/QueryOptions.cs
+++ b/src/Couchbase.Analytics/Options/QueryOptions.cs
@@ -20,8 +20,8 @@
 #endregion
 
 using System.Text.Json;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
+using Couchbase.Core.Json;
 using Couchbase.Core.Utils;
 
 namespace Couchbase.AnalyticsClient.Options;
diff --git a/src/Couchbase.Analytics/Json/IDeserializer.cs b/src/Couchbase.Core/Json/IDeserializer.cs
similarity index 96%
rename from src/Couchbase.Analytics/Json/IDeserializer.cs
rename to src/Couchbase.Core/Json/IDeserializer.cs
index 7047ab8..a119fb8 100644
--- a/src/Couchbase.Analytics/Json/IDeserializer.cs
+++ b/src/Couchbase.Core/Json/IDeserializer.cs
@@ -19,9 +19,7 @@
  * ************************************************************/
 #endregion
 
-using Couchbase.Core.Json;
-
-namespace Couchbase.AnalyticsClient.Json;
+namespace Couchbase.Core.Json;
 
 public interface IDeserializer
 {
diff --git a/src/Couchbase.Analytics/Json/ISerializer.cs b/src/Couchbase.Core/Json/ISerializer.cs
similarity index 97%
rename from src/Couchbase.Analytics/Json/ISerializer.cs
rename to src/Couchbase.Core/Json/ISerializer.cs
index e097ff1..c57432b 100644
--- a/src/Couchbase.Analytics/Json/ISerializer.cs
+++ b/src/Couchbase.Core/Json/ISerializer.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.Json;
+namespace Couchbase.Core.Json;
 
 /// <summary>
 /// The Default serializer that is based on System.Text.Json
diff --git a/src/Couchbase.Analytics/Json/ISerializerDeserializer.cs b/src/Couchbase.Core/Json/ISerializerDeserializer.cs
similarity index 95%
rename from src/Couchbase.Analytics/Json/ISerializerDeserializer.cs
rename to src/Couchbase.Core/Json/ISerializerDeserializer.cs
index b62bcf3..5670963 100644
--- a/src/Couchbase.Analytics/Json/ISerializerDeserializer.cs
+++ b/src/Couchbase.Core/Json/ISerializerDeserializer.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.Json;
+namespace Couchbase.Core.Json;
 
 public interface ISerializerDeserializer
 {
diff --git a/src/Couchbase.Analytics/Json/StjJsonDeserializer.cs b/src/Couchbase.Core/Json/StjJsonDeserializer.cs
similarity index 95%
rename from src/Couchbase.Analytics/Json/StjJsonDeserializer.cs
rename to src/Couchbase.Core/Json/StjJsonDeserializer.cs
index c2e271a..85a23e2 100644
--- a/src/Couchbase.Analytics/Json/StjJsonDeserializer.cs
+++ b/src/Couchbase.Core/Json/StjJsonDeserializer.cs
@@ -20,9 +20,8 @@
 #endregion
 
 using System.Text.Json;
-using Couchbase.Core.Json;
 
-namespace Couchbase.AnalyticsClient.Json;
+namespace Couchbase.Core.Json;
 
 /// <inheritdoc />>
 public class StjJsonDeserializer(JsonSerializerOptions jsonSerializerOptions): IDeserializer
diff --git a/src/Couchbase.Analytics/Json/StjJsonSerializer.cs b/src/Couchbase.Core/Json/StjJsonSerializer.cs
similarity index 96%
rename from src/Couchbase.Analytics/Json/StjJsonSerializer.cs
rename to src/Couchbase.Core/Json/StjJsonSerializer.cs
index 84e37ca..6ce2808 100644
--- a/src/Couchbase.Analytics/Json/StjJsonSerializer.cs
+++ b/src/Couchbase.Core/Json/StjJsonSerializer.cs
@@ -21,7 +21,7 @@
 
 using System.Text.Json;
 
-namespace Couchbase.AnalyticsClient.Json;
+namespace Couchbase.Core.Json;
 
 /// <inheritdoc />
 public class StjJsonSerializer(JsonSerializerOptions jsonSerializerOptions) : ISerializer
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
index 476768b..3973a86 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
@@ -3,7 +3,6 @@
 using Couchbase.AnalyticsClient.Internal;
 using Couchbase.AnalyticsClient.Internal.HTTP;
 using Couchbase.AnalyticsClient.Internal.Results;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.Core.Json;
 using Microsoft.Extensions.Logging;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
index 6ba6c36..739b8d7 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
@@ -1,5 +1,5 @@
 using Couchbase.AnalyticsClient.Internal.Results;
-using Couchbase.AnalyticsClient.Json;
+using Couchbase.Core.Json;
 using Xunit;
 
 namespace Couchbase.AnalyticsClient.UnitTests.Internal;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
index 0699906..934c91b 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
@@ -5,9 +5,9 @@
 using Couchbase.AnalyticsClient.Exceptions;
 using Couchbase.AnalyticsClient.HTTP;
 using Couchbase.AnalyticsClient.Internal.HTTP;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
+using Couchbase.Core.Json;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Moq.Protected;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
index 163a1e6..969f3c0 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
@@ -6,9 +6,9 @@
 using Couchbase.AnalyticsClient.DI;
 using Couchbase.AnalyticsClient.HTTP;
 using Couchbase.AnalyticsClient.Internal.HTTP;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
+using Couchbase.Core.Json;
 using Moq.Protected;
 
 namespace Couchbase.AnalyticsClient.UnitTests.Internal;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs
index d4ed555..e8ccf11 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs
@@ -1,6 +1,6 @@
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
+using Couchbase.Core.Json;
 using Xunit;
 
 namespace Couchbase.AnalyticsClient.UnitTests.Internal;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
index b4f1dca..a956ff7 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using Couchbase.AnalyticsClient.Internal.Results;
-using Couchbase.AnalyticsClient.Json;
 using Couchbase.Core.Json;
 using Moq;
 using Xunit;