diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs
index 212bdde..6a47f10 100644
--- a/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs
+++ b/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs
@@ -3,6 +3,7 @@
using InvalidCredentialException = Couchbase.AnalyticsClient.Exceptions.InvalidCredentialException;
using QueryException = Couchbase.AnalyticsClient.Exceptions.QueryException;
+
namespace Couchbase.Analytics.Performer.Internal.Utils;
internal static class ExceptionExtensions
diff --git a/src/Couchbase.Analytics/Certificates/CertificateValidation.cs b/src/Couchbase.Analytics/Certificates/CertificateValidation.cs
index 03cd1d6..54615e0 100644
--- a/src/Couchbase.Analytics/Certificates/CertificateValidation.cs
+++ b/src/Couchbase.Analytics/Certificates/CertificateValidation.cs
@@ -19,9 +19,9 @@
* ************************************************************/
#endregion
+using System.Net.Security;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
-using System.Net.Security;
using Couchbase.AnalyticsClient.Options;
using Microsoft.Extensions.Logging;
diff --git a/src/Couchbase.Analytics/Cluster.cs b/src/Couchbase.Analytics/Cluster.cs
index 58ab4e6..a880fce 100644
--- a/src/Couchbase.Analytics/Cluster.cs
+++ b/src/Couchbase.Analytics/Cluster.cs
@@ -20,8 +20,9 @@
#endregion
using System.Collections.Concurrent;
-using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal;
+using Couchbase.AnalyticsClient.Internal.DI;
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Results;
using Microsoft.Extensions.Logging;
diff --git a/src/Couchbase.Analytics/Couchbase.Analytics.csproj b/src/Couchbase.Analytics/Couchbase.Analytics.csproj
index a4f8c48..3f88a50 100644
--- a/src/Couchbase.Analytics/Couchbase.Analytics.csproj
+++ b/src/Couchbase.Analytics/Couchbase.Analytics.csproj
@@ -22,6 +22,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs b/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs
index aa9078f..4d16973 100644
--- a/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs
+++ b/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs
@@ -21,8 +21,7 @@
using System.Runtime.Serialization;
using System.Text;
-using System.Text.Json;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
namespace Couchbase.AnalyticsClient.Exceptions;
diff --git a/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs b/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs
index 003271f..a7c71ac 100644
--- a/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs
+++ b/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs
@@ -20,7 +20,7 @@
#endregion
using System.Runtime.Serialization;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
namespace Couchbase.AnalyticsClient.Exceptions;
diff --git a/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs b/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs
index 210d725..aae642b 100644
--- a/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs
+++ b/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs
@@ -20,8 +20,7 @@
#endregion
using System.Runtime.Serialization;
-using System.Text.Json;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
namespace Couchbase.AnalyticsClient.Exceptions;
diff --git a/src/Couchbase.Analytics/Exceptions/QueryException.cs b/src/Couchbase.Analytics/Exceptions/QueryException.cs
index 6d7cb8a..97e1c58 100644
--- a/src/Couchbase.Analytics/Exceptions/QueryException.cs
+++ b/src/Couchbase.Analytics/Exceptions/QueryException.cs
@@ -20,7 +20,7 @@
#endregion
using System.Runtime.Serialization;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
namespace Couchbase.AnalyticsClient.Exceptions;
diff --git a/src/Couchbase.Analytics/AnalyticsService.cs b/src/Couchbase.Analytics/Internal/AnalyticsService.cs
similarity index 97%
rename from src/Couchbase.Analytics/AnalyticsService.cs
rename to src/Couchbase.Analytics/Internal/AnalyticsService.cs
index b443fac..91e0e13 100644
--- a/src/Couchbase.Analytics/AnalyticsService.cs
+++ b/src/Couchbase.Analytics/Internal/AnalyticsService.cs
@@ -22,14 +22,16 @@
using System.Text;
using Couchbase.AnalyticsClient.Exceptions;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
+using Couchbase.AnalyticsClient.Internal.Results;
+using Couchbase.AnalyticsClient.Internal.Retry;
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Results;
-using Couchbase.AnalyticsClient.Retry;
using Couchbase.Text.Json;
using Couchbase.Text.Json.Utils;
using Microsoft.Extensions.Logging;
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
internal sealed class AnalyticsService : HttpServiceBase, IAnalyticsService
{
diff --git a/src/Couchbase.Analytics/ConnectionString.cs b/src/Couchbase.Analytics/Internal/ConnectionString.cs
similarity index 98%
rename from src/Couchbase.Analytics/ConnectionString.cs
rename to src/Couchbase.Analytics/Internal/ConnectionString.cs
index f58c000..b01cc07 100644
--- a/src/Couchbase.Analytics/ConnectionString.cs
+++ b/src/Couchbase.Analytics/Internal/ConnectionString.cs
@@ -21,9 +21,10 @@
using System.Text;
using System.Text.RegularExpressions;
+using Couchbase.AnalyticsClient.Internal.Utils;
using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
internal class ConnectionString
{
diff --git a/src/Couchbase.Analytics/DI/ConstructorSelector.cs b/src/Couchbase.Analytics/Internal/DI/ConstructorSelector.cs
similarity index 98%
rename from src/Couchbase.Analytics/DI/ConstructorSelector.cs
rename to src/Couchbase.Analytics/Internal/DI/ConstructorSelector.cs
index 5dd7363..e519b53 100644
--- a/src/Couchbase.Analytics/DI/ConstructorSelector.cs
+++ b/src/Couchbase.Analytics/Internal/DI/ConstructorSelector.cs
@@ -22,7 +22,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
internal static class ConstructorSelector
{
diff --git a/src/Couchbase.Analytics/DI/CouchbaseServiceProvider.cs b/src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProvider.cs
similarity index 98%
rename from src/Couchbase.Analytics/DI/CouchbaseServiceProvider.cs
rename to src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProvider.cs
index 2dd9a4f..b6dea10 100644
--- a/src/Couchbase.Analytics/DI/CouchbaseServiceProvider.cs
+++ b/src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProvider.cs
@@ -21,7 +21,7 @@
using System.Collections.ObjectModel;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
internal sealed class CouchbaseServiceProvider : ICouchbaseServiceProvider
{
diff --git a/src/Couchbase.Analytics/DI/CouchbaseServiceProviderExtensions.cs b/src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProviderExtensions.cs
similarity index 98%
rename from src/Couchbase.Analytics/DI/CouchbaseServiceProviderExtensions.cs
rename to src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProviderExtensions.cs
index f4c32ef..58b7406 100644
--- a/src/Couchbase.Analytics/DI/CouchbaseServiceProviderExtensions.cs
+++ b/src/Couchbase.Analytics/Internal/DI/CouchbaseServiceProviderExtensions.cs
@@ -21,7 +21,7 @@
using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// Extensions for .
diff --git a/src/Couchbase.Analytics/DI/DefaultServices.cs b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
similarity index 96%
rename from src/Couchbase.Analytics/DI/DefaultServices.cs
rename to src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
index 28ebcb7..0912c4a 100644
--- a/src/Couchbase.Analytics/DI/DefaultServices.cs
+++ b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
@@ -20,12 +20,12 @@
#endregion
using System.Text.Json;
-using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.Text.Json;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
internal static class DefaultServices
{
diff --git a/src/Couchbase.Analytics/DI/ICouchbaseServiceProvider.cs b/src/Couchbase.Analytics/Internal/DI/ICouchbaseServiceProvider.cs
similarity index 96%
rename from src/Couchbase.Analytics/DI/ICouchbaseServiceProvider.cs
rename to src/Couchbase.Analytics/Internal/DI/ICouchbaseServiceProvider.cs
index 2430a51..dfb444f 100644
--- a/src/Couchbase.Analytics/DI/ICouchbaseServiceProvider.cs
+++ b/src/Couchbase.Analytics/Internal/DI/ICouchbaseServiceProvider.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// Extends with a method to test for service registration.
diff --git a/src/Couchbase.Analytics/DI/IServiceFactory.cs b/src/Couchbase.Analytics/Internal/DI/IServiceFactory.cs
similarity index 96%
rename from src/Couchbase.Analytics/DI/IServiceFactory.cs
rename to src/Couchbase.Analytics/Internal/DI/IServiceFactory.cs
index 2e667cf..f097fed 100644
--- a/src/Couchbase.Analytics/DI/IServiceFactory.cs
+++ b/src/Couchbase.Analytics/Internal/DI/IServiceFactory.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// A factory capable of returning a service.
diff --git a/src/Couchbase.Analytics/DI/LazyService.cs b/src/Couchbase.Analytics/Internal/DI/LazyService.cs
similarity index 97%
rename from src/Couchbase.Analytics/DI/LazyService.cs
rename to src/Couchbase.Analytics/Internal/DI/LazyService.cs
index f0cd6fc..6f730dc 100644
--- a/src/Couchbase.Analytics/DI/LazyService.cs
+++ b/src/Couchbase.Analytics/Internal/DI/LazyService.cs
@@ -22,7 +22,7 @@
using System.Diagnostics.CodeAnalysis;
using Couchbase.AnalyticsClient.Exceptions;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// References a singleton of a service that isn't instantiated until required.
diff --git a/src/Couchbase.Analytics/DI/PreferredConstructorAttribute.cs b/src/Couchbase.Analytics/Internal/DI/PreferredConstructorAttribute.cs
similarity index 91%
rename from src/Couchbase.Analytics/DI/PreferredConstructorAttribute.cs
rename to src/Couchbase.Analytics/Internal/DI/PreferredConstructorAttribute.cs
index f923c41..1d1aa34 100644
--- a/src/Couchbase.Analytics/DI/PreferredConstructorAttribute.cs
+++ b/src/Couchbase.Analytics/Internal/DI/PreferredConstructorAttribute.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// Marks a public constructor as preferred for selection by service factories. If applied, the
@@ -28,6 +28,6 @@ namespace Couchbase.AnalyticsClient.DI;
/// attribute.
///
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
-public sealed class PreferredConstructorAttribute : Attribute
+internal sealed class PreferredConstructorAttribute : Attribute
{
}
\ No newline at end of file
diff --git a/src/Couchbase.Analytics/DI/SingletonGenericServiceFactory.cs b/src/Couchbase.Analytics/Internal/DI/SingletonGenericServiceFactory.cs
similarity index 99%
rename from src/Couchbase.Analytics/DI/SingletonGenericServiceFactory.cs
rename to src/Couchbase.Analytics/Internal/DI/SingletonGenericServiceFactory.cs
index 36b0460..89da019 100644
--- a/src/Couchbase.Analytics/DI/SingletonGenericServiceFactory.cs
+++ b/src/Couchbase.Analytics/Internal/DI/SingletonGenericServiceFactory.cs
@@ -23,7 +23,7 @@
using System.Diagnostics.CodeAnalysis;
using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// Implementation of which constructs more specific types
diff --git a/src/Couchbase.Analytics/DI/SingletonServiceFactory.cs b/src/Couchbase.Analytics/Internal/DI/SingletonServiceFactory.cs
similarity index 98%
rename from src/Couchbase.Analytics/DI/SingletonServiceFactory.cs
rename to src/Couchbase.Analytics/Internal/DI/SingletonServiceFactory.cs
index 1c7626b..2aad5ea 100644
--- a/src/Couchbase.Analytics/DI/SingletonServiceFactory.cs
+++ b/src/Couchbase.Analytics/Internal/DI/SingletonServiceFactory.cs
@@ -22,7 +22,7 @@
using System.Diagnostics.CodeAnalysis;
using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
internal sealed class SingletonServiceFactory : IServiceFactory
{
diff --git a/src/Couchbase.Analytics/DI/TransientServiceFactory.cs b/src/Couchbase.Analytics/Internal/DI/TransientServiceFactory.cs
similarity index 98%
rename from src/Couchbase.Analytics/DI/TransientServiceFactory.cs
rename to src/Couchbase.Analytics/Internal/DI/TransientServiceFactory.cs
index 7affa7f..4fb4574 100644
--- a/src/Couchbase.Analytics/DI/TransientServiceFactory.cs
+++ b/src/Couchbase.Analytics/Internal/DI/TransientServiceFactory.cs
@@ -22,7 +22,7 @@
using System.Diagnostics.CodeAnalysis;
using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
///
/// Implementation of which creates a transient
diff --git a/src/Couchbase.Analytics/DnsUtil/DnsEndpointConnector.cs b/src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointConnector.cs
similarity index 96%
rename from src/Couchbase.Analytics/DnsUtil/DnsEndpointConnector.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointConnector.cs
index fb277f0..9692f96 100644
--- a/src/Couchbase.Analytics/DnsUtil/DnsEndpointConnector.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointConnector.cs
@@ -21,9 +21,10 @@
using System.Net;
using System.Net.Sockets;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
///
/// Adapted from https://github.com/MihaZupan/DnsRoundRobin.
diff --git a/src/Couchbase.Analytics/DnsUtil/DnsEndpointResolver.cs b/src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointResolver.cs
similarity index 91%
rename from src/Couchbase.Analytics/DnsUtil/DnsEndpointResolver.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointResolver.cs
index 171c2ec..573dc39 100644
--- a/src/Couchbase.Analytics/DnsUtil/DnsEndpointResolver.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/DnsEndpointResolver.cs
@@ -20,9 +20,10 @@
#endregion
using System.Net;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
internal class DnsEndpointResolver : IDnsEndpointResolver
{
diff --git a/src/Couchbase.Analytics/DnsUtil/EndpointConnectionManager.cs b/src/Couchbase.Analytics/Internal/DnsUtil/EndpointConnectionManager.cs
similarity index 97%
rename from src/Couchbase.Analytics/DnsUtil/EndpointConnectionManager.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/EndpointConnectionManager.cs
index b055bfa..b25d4f9 100644
--- a/src/Couchbase.Analytics/DnsUtil/EndpointConnectionManager.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/EndpointConnectionManager.cs
@@ -21,11 +21,11 @@
using System.Net;
using System.Net.Sockets;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
internal class EndpointConnectionManager
{
diff --git a/src/Couchbase.Analytics/DnsUtil/EndpointSelectionMode.cs b/src/Couchbase.Analytics/Internal/DnsUtil/EndpointSelectionMode.cs
similarity index 95%
rename from src/Couchbase.Analytics/DnsUtil/EndpointSelectionMode.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/EndpointSelectionMode.cs
index 357fbda..83fc5de 100644
--- a/src/Couchbase.Analytics/DnsUtil/EndpointSelectionMode.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/EndpointSelectionMode.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
internal enum EndpointSelectionMode
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs
similarity index 96%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs
index 41ebdd2..f75a450 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/CountBasedDnsRefreshStrategy.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal class CountBasedDnsRefreshStrategy : IDnsRefreshStrategy
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/IDnsRefreshStrategy.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IDnsRefreshStrategy.cs
similarity index 93%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/IDnsRefreshStrategy.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IDnsRefreshStrategy.cs
index a907ab2..0948340 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/IDnsRefreshStrategy.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IDnsRefreshStrategy.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal interface IDnsRefreshStrategy
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/IEndpointSelectionStrategy.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IEndpointSelectionStrategy.cs
similarity index 93%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/IEndpointSelectionStrategy.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IEndpointSelectionStrategy.cs
index be29a7b..20aa101 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/IEndpointSelectionStrategy.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/IEndpointSelectionStrategy.cs
@@ -21,7 +21,7 @@
using System.Net;
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal interface IEndpointSelectionStrategy
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/RandomEndpointSelector.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RandomEndpointSelector.cs
similarity index 97%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/RandomEndpointSelector.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RandomEndpointSelector.cs
index 07cd181..4a63000 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/RandomEndpointSelector.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RandomEndpointSelector.cs
@@ -21,7 +21,7 @@
using System.Net;
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal class RandomEndpointSelector : IEndpointSelectionStrategy
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/RoundRobinEndpointSelector.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RoundRobinEndpointSelector.cs
similarity index 96%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/RoundRobinEndpointSelector.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RoundRobinEndpointSelector.cs
index 21cf71f..2ea2656 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/RoundRobinEndpointSelector.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/RoundRobinEndpointSelector.cs
@@ -21,7 +21,7 @@
using System.Net;
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal class RoundRobinEndpointSelector : IEndpointSelectionStrategy
{
diff --git a/src/Couchbase.Analytics/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs
similarity index 96%
rename from src/Couchbase.Analytics/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs
rename to src/Couchbase.Analytics/Internal/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs
index 64689dd..78d7a34 100644
--- a/src/Couchbase.Analytics/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs
+++ b/src/Couchbase.Analytics/Internal/DnsUtil/Strategies/TimeBasedDnsRefreshStrategy.cs
@@ -21,7 +21,7 @@
using System.Diagnostics;
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
internal class TimeBasedDnsRefreshStrategy : IDnsRefreshStrategy
{
diff --git a/src/Couchbase.Analytics/HTTP/AuthenticationHandler.cs b/src/Couchbase.Analytics/Internal/HTTP/AuthenticationHandler.cs
similarity index 95%
rename from src/Couchbase.Analytics/HTTP/AuthenticationHandler.cs
rename to src/Couchbase.Analytics/Internal/HTTP/AuthenticationHandler.cs
index c05d7c8..fa89a1f 100644
--- a/src/Couchbase.Analytics/HTTP/AuthenticationHandler.cs
+++ b/src/Couchbase.Analytics/Internal/HTTP/AuthenticationHandler.cs
@@ -21,8 +21,9 @@
using System.Net.Http.Headers;
using System.Text;
+using Couchbase.AnalyticsClient.HTTP;
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
internal class AuthenticationHandler : DelegatingHandler
{
diff --git a/src/Couchbase.Analytics/HTTP/CouchbaseHttpClientFactory.cs b/src/Couchbase.Analytics/Internal/HTTP/CouchbaseHttpClientFactory.cs
similarity index 96%
rename from src/Couchbase.Analytics/HTTP/CouchbaseHttpClientFactory.cs
rename to src/Couchbase.Analytics/Internal/HTTP/CouchbaseHttpClientFactory.cs
index 13993d2..ef86ac1 100644
--- a/src/Couchbase.Analytics/HTTP/CouchbaseHttpClientFactory.cs
+++ b/src/Couchbase.Analytics/Internal/HTTP/CouchbaseHttpClientFactory.cs
@@ -22,13 +22,14 @@
using System.Net.Sockets;
using System.Security.Cryptography.X509Certificates;
using Couchbase.AnalyticsClient.Certificates;
-using Couchbase.AnalyticsClient.DnsUtil;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.Utils;
using Couchbase.AnalyticsClient.Options;
-using Couchbase.AnalyticsClient.Utils;
using Microsoft.Extensions.Logging;
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
internal class CouchbaseHttpClientFactory : ICouchbaseHttpClientFactory
{
diff --git a/src/Couchbase.Analytics/HTTP/HttpServiceBase.cs b/src/Couchbase.Analytics/Internal/HTTP/HttpServiceBase.cs
similarity index 96%
rename from src/Couchbase.Analytics/HTTP/HttpServiceBase.cs
rename to src/Couchbase.Analytics/Internal/HTTP/HttpServiceBase.cs
index 9554e58..ea37a6b 100644
--- a/src/Couchbase.Analytics/HTTP/HttpServiceBase.cs
+++ b/src/Couchbase.Analytics/Internal/HTTP/HttpServiceBase.cs
@@ -19,9 +19,9 @@
* ************************************************************/
#endregion
-using Couchbase.AnalyticsClient.Utils;
+using Couchbase.AnalyticsClient.Internal.Utils;
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
///
/// Base class for HTTP services to inherit from to provide consistent access to clusterOptions,
diff --git a/src/Couchbase.Analytics/HTTP/ICouchbaseHttpClientFactory.cs b/src/Couchbase.Analytics/Internal/HTTP/ICouchbaseHttpClientFactory.cs
similarity index 97%
rename from src/Couchbase.Analytics/HTTP/ICouchbaseHttpClientFactory.cs
rename to src/Couchbase.Analytics/Internal/HTTP/ICouchbaseHttpClientFactory.cs
index 4ef4c4d..da7ff47 100644
--- a/src/Couchbase.Analytics/HTTP/ICouchbaseHttpClientFactory.cs
+++ b/src/Couchbase.Analytics/Internal/HTTP/ICouchbaseHttpClientFactory.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
///
/// Creates an which may be safely configured and disposed, but while
diff --git a/src/Couchbase.Analytics/IAnalyticsService.cs b/src/Couchbase.Analytics/Internal/IAnalyticsService.cs
similarity index 95%
rename from src/Couchbase.Analytics/IAnalyticsService.cs
rename to src/Couchbase.Analytics/Internal/IAnalyticsService.cs
index 2ec1518..596b169 100644
--- a/src/Couchbase.Analytics/IAnalyticsService.cs
+++ b/src/Couchbase.Analytics/Internal/IAnalyticsService.cs
@@ -22,7 +22,7 @@
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Results;
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
internal interface IAnalyticsService
{
diff --git a/src/Couchbase.Analytics/Results/AnalyticsResultBase.cs b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
similarity index 96%
rename from src/Couchbase.Analytics/Results/AnalyticsResultBase.cs
rename to src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
index bc94ce4..a7edf97 100644
--- a/src/Couchbase.Analytics/Results/AnalyticsResultBase.cs
+++ b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
@@ -21,9 +21,10 @@
using System.Net;
using Couchbase.AnalyticsClient.Query;
+using Couchbase.AnalyticsClient.Results;
using Couchbase.Text.Json;
-namespace Couchbase.AnalyticsClient.Results;
+namespace Couchbase.AnalyticsClient.Internal.Results;
internal abstract class AnalyticsResultBase : IQueryResult
{
diff --git a/src/Couchbase.Analytics/Results/BlockingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
similarity index 97%
rename from src/Couchbase.Analytics/Results/BlockingAnalyticsResult.cs
rename to src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
index c384e5c..65c66f7 100644
--- a/src/Couchbase.Analytics/Results/BlockingAnalyticsResult.cs
+++ b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
@@ -22,10 +22,11 @@
using System.Runtime.CompilerServices;
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Query;
+using Couchbase.AnalyticsClient.Results;
using Couchbase.AnalyticsClient.Utils;
using Couchbase.Text.Json;
-namespace Couchbase.AnalyticsClient.Results;
+namespace Couchbase.AnalyticsClient.Internal.Results;
///
/// A "blocking" result class for Analytics queries.
diff --git a/src/Couchbase.Analytics/Results/StreamingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
similarity index 98%
rename from src/Couchbase.Analytics/Results/StreamingAnalyticsResult.cs
rename to src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
index d19d3eb..5e724b9 100644
--- a/src/Couchbase.Analytics/Results/StreamingAnalyticsResult.cs
+++ b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
@@ -21,9 +21,10 @@
using System.Runtime.CompilerServices;
using Couchbase.AnalyticsClient.Query;
+using Couchbase.AnalyticsClient.Results;
using Couchbase.Text.Json;
-namespace Couchbase.AnalyticsClient.Results;
+namespace Couchbase.AnalyticsClient.Internal.Results;
///
/// A streaming response class for Analytics queries.
diff --git a/src/Couchbase.Analytics/Retry/AnalyticsErrorMapper.cs b/src/Couchbase.Analytics/Internal/Retry/AnalyticsErrorMapper.cs
similarity index 98%
rename from src/Couchbase.Analytics/Retry/AnalyticsErrorMapper.cs
rename to src/Couchbase.Analytics/Internal/Retry/AnalyticsErrorMapper.cs
index 1175151..97c0809 100644
--- a/src/Couchbase.Analytics/Retry/AnalyticsErrorMapper.cs
+++ b/src/Couchbase.Analytics/Internal/Retry/AnalyticsErrorMapper.cs
@@ -22,11 +22,11 @@
using System.Net;
using System.Net.Sockets;
using Couchbase.AnalyticsClient.Exceptions;
+using Couchbase.AnalyticsClient.Internal.Results;
using Couchbase.AnalyticsClient.Query;
-using Couchbase.AnalyticsClient.Results;
using TimeoutException = System.TimeoutException;
-namespace Couchbase.AnalyticsClient.Retry;
+namespace Couchbase.AnalyticsClient.Internal.Retry;
///
/// Static utility for mapping HTTP status codes and server error codes to Analytics exceptions.
diff --git a/src/Couchbase.Analytics/Retry/ErrorContext.cs b/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs
similarity index 97%
rename from src/Couchbase.Analytics/Retry/ErrorContext.cs
rename to src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs
index b57c48f..00be13e 100644
--- a/src/Couchbase.Analytics/Retry/ErrorContext.cs
+++ b/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs
@@ -25,7 +25,7 @@
using Couchbase.AnalyticsClient.Query;
using Couchbase.Text.Json.Utils;
-namespace Couchbase.AnalyticsClient.Retry;
+namespace Couchbase.AnalyticsClient.Internal.Retry;
internal class ErrorContext
{
diff --git a/src/Couchbase.Analytics/Retry/RetryUtils.cs b/src/Couchbase.Analytics/Internal/Retry/RetryUtils.cs
similarity index 97%
rename from src/Couchbase.Analytics/Retry/RetryUtils.cs
rename to src/Couchbase.Analytics/Internal/Retry/RetryUtils.cs
index d957fcc..d970ec3 100644
--- a/src/Couchbase.Analytics/Retry/RetryUtils.cs
+++ b/src/Couchbase.Analytics/Internal/Retry/RetryUtils.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.Retry;
+namespace Couchbase.AnalyticsClient.Internal.Retry;
///
/// Static utility methods for retry logic.
diff --git a/src/Couchbase.Analytics/Utils/ClientIdentifier.cs b/src/Couchbase.Analytics/Internal/Utils/ClientIdentifier.cs
similarity index 98%
rename from src/Couchbase.Analytics/Utils/ClientIdentifier.cs
rename to src/Couchbase.Analytics/Internal/Utils/ClientIdentifier.cs
index 62a5011..baa8580 100644
--- a/src/Couchbase.Analytics/Utils/ClientIdentifier.cs
+++ b/src/Couchbase.Analytics/Internal/Utils/ClientIdentifier.cs
@@ -22,7 +22,7 @@
using System.Net.Http.Headers;
using System.Runtime.InteropServices;
-namespace Couchbase.AnalyticsClient.Utils;
+namespace Couchbase.AnalyticsClient.Internal.Utils;
internal static class ClientIdentifier
{
diff --git a/src/Couchbase.Analytics/Utils/ConnectionStringParams.cs b/src/Couchbase.Analytics/Internal/Utils/ConnectionStringParams.cs
similarity index 96%
rename from src/Couchbase.Analytics/Utils/ConnectionStringParams.cs
rename to src/Couchbase.Analytics/Internal/Utils/ConnectionStringParams.cs
index e913467..f75f3bb 100644
--- a/src/Couchbase.Analytics/Utils/ConnectionStringParams.cs
+++ b/src/Couchbase.Analytics/Internal/Utils/ConnectionStringParams.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.Utils;
+namespace Couchbase.AnalyticsClient.Internal.Utils;
internal static class ConnectionStringParams
{
diff --git a/src/Couchbase.Analytics/Utils/CurrentAssembly.cs b/src/Couchbase.Analytics/Internal/Utils/CurrentAssembly.cs
similarity index 97%
rename from src/Couchbase.Analytics/Utils/CurrentAssembly.cs
rename to src/Couchbase.Analytics/Internal/Utils/CurrentAssembly.cs
index 3481255..d156892 100644
--- a/src/Couchbase.Analytics/Utils/CurrentAssembly.cs
+++ b/src/Couchbase.Analytics/Internal/Utils/CurrentAssembly.cs
@@ -21,7 +21,7 @@
using System.Reflection;
-namespace Couchbase.AnalyticsClient.Utils;
+namespace Couchbase.AnalyticsClient.Internal.Utils;
internal static class CurrentAssembly
{
diff --git a/src/Couchbase.Analytics/Utils/IEnumerableExtensions.cs b/src/Couchbase.Analytics/Internal/Utils/IEnumerableExtensions.cs
similarity index 99%
rename from src/Couchbase.Analytics/Utils/IEnumerableExtensions.cs
rename to src/Couchbase.Analytics/Internal/Utils/IEnumerableExtensions.cs
index 0699c13..90ed874 100644
--- a/src/Couchbase.Analytics/Utils/IEnumerableExtensions.cs
+++ b/src/Couchbase.Analytics/Internal/Utils/IEnumerableExtensions.cs
@@ -21,8 +21,9 @@
using System.Runtime.InteropServices;
using System.Security.Cryptography;
+using Couchbase.AnalyticsClient.Utils;
-namespace Couchbase.AnalyticsClient.Utils
+namespace Couchbase.AnalyticsClient.Internal.Utils
{
internal static class ArrayExtensions
{
diff --git a/src/Couchbase.Analytics/Utils/SequenceGenerator.cs b/src/Couchbase.Analytics/Internal/Utils/SequenceGenerator.cs
similarity index 97%
rename from src/Couchbase.Analytics/Utils/SequenceGenerator.cs
rename to src/Couchbase.Analytics/Internal/Utils/SequenceGenerator.cs
index adfdf6c..24cdeef 100644
--- a/src/Couchbase.Analytics/Utils/SequenceGenerator.cs
+++ b/src/Couchbase.Analytics/Internal/Utils/SequenceGenerator.cs
@@ -19,7 +19,7 @@
* ************************************************************/
#endregion
-namespace Couchbase.AnalyticsClient.Utils;
+namespace Couchbase.AnalyticsClient.Internal.Utils;
internal static class SequenceGenerator
{
diff --git a/src/Couchbase.Analytics/Options/ClusterOptions.cs b/src/Couchbase.Analytics/Options/ClusterOptions.cs
index 4f1db55..96708af 100644
--- a/src/Couchbase.Analytics/Options/ClusterOptions.cs
+++ b/src/Couchbase.Analytics/Options/ClusterOptions.cs
@@ -23,7 +23,9 @@
using System.Security.Authentication;
using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.HTTP;
-using Couchbase.AnalyticsClient.Utils;
+using Couchbase.AnalyticsClient.Internal;
+using Couchbase.AnalyticsClient.Internal.DI;
+using Couchbase.AnalyticsClient.Internal.Utils;
using Couchbase.Text.Json.Utils;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@@ -125,7 +127,7 @@ internal string? ConnectionString
get => ConnectionStringValue?.ToString();
set
{
- ConnectionStringValue = value != null ? AnalyticsClient.ConnectionString.Parse(value) : null;
+ ConnectionStringValue = value != null ? Internal.ConnectionString.Parse(value) : null;
if (ConnectionStringValue == null) return;
diff --git a/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs b/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs
index aa4812d..7a7c6fd 100644
--- a/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs
+++ b/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs
@@ -3,11 +3,13 @@
using Xunit;
using Xunit.Abstractions;
using System.Net;
-using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.DnsUtil;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
using Couchbase.AnalyticsClient.Exceptions;
-using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal;
+using Couchbase.AnalyticsClient.Internal.DI;
+using Couchbase.AnalyticsClient.Internal.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.AnalyticsClient.Options;
namespace Couchbase.AnalyticsClient.FunctionalTests.Internal;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
index b3ab7a0..0942c92 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
@@ -2,9 +2,10 @@
using System.Net.Http.Headers;
using System.Runtime.InteropServices.JavaScript;
using System.Text;
-using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal;
+using Couchbase.AnalyticsClient.Internal.HTTP;
+using Couchbase.AnalyticsClient.Internal.Results;
using Couchbase.AnalyticsClient.Options;
-using Couchbase.AnalyticsClient.Results;
using Couchbase.Text.Json;
using Microsoft.Extensions.Logging;
using Moq;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
index 6df6dee..6e07a6b 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
@@ -1,5 +1,5 @@
using System.Text.Json;
-using Couchbase.AnalyticsClient.Results;
+using Couchbase.AnalyticsClient.Internal.Results;
using Couchbase.Text.Json;
using Newtonsoft.Json;
using Xunit;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
index 11caafc..87d0660 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
@@ -4,8 +4,9 @@
using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.Exceptions;
using Couchbase.AnalyticsClient.HTTP;
-using Couchbase.AnalyticsClient.Query;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.AnalyticsClient.Options;
+using Couchbase.AnalyticsClient.Query;
using Couchbase.Text.Json;
using Microsoft.Extensions.Logging;
using Moq;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/ConnectionStringTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/ConnectionStringTests.cs
index f2ab317..7109520 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/ConnectionStringTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/ConnectionStringTests.cs
@@ -1,5 +1,6 @@
using System.Security.Authentication;
using Couchbase.AnalyticsClient.Certificates;
+using Couchbase.AnalyticsClient.Internal;
using Couchbase.AnalyticsClient.Options;
using Xunit;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs
index ff79948..d406e87 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs
@@ -1,5 +1,5 @@
using System;
-using Couchbase.AnalyticsClient.DI;
+using Couchbase.AnalyticsClient.Internal.DI;
using Microsoft.Extensions.DependencyInjection;
using Xunit;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs
index 1bfdf9c..a9fe285 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs
@@ -1,8 +1,9 @@
using System.Net;
using System.Reflection;
-using Couchbase.AnalyticsClient.DnsUtil;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.AnalyticsClient.Options;
using Microsoft.Extensions.Logging;
using Moq;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointConnectionManagerTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointConnectionManagerTests.cs
index fa8e718..d6ec44a 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointConnectionManagerTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointConnectionManagerTests.cs
@@ -1,6 +1,6 @@
using System.Net;
-using Couchbase.AnalyticsClient.DnsUtil;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
using Xunit;
using Xunit.Abstractions;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs
index 60041b1..b244b21 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs
@@ -2,7 +2,7 @@
using Xunit;
using System.Linq;
using System.Reflection;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
using Xunit.Abstractions;
namespace Couchbase.AnalyticsClient.UnitTests.Internal.DnsUtil;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/ExecuteQueryTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/ExecuteQueryTests.cs
index 38341ff..9eb86e2 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/ExecuteQueryTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/ExecuteQueryTests.cs
@@ -1,5 +1,6 @@
using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal;
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Query;
using Couchbase.AnalyticsClient.Results;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/HTTP/AnalyticsHttpClientFactoryTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/HTTP/AnalyticsHttpClientFactoryTests.cs
index b7db7f4..37249c5 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/HTTP/AnalyticsHttpClientFactoryTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/HTTP/AnalyticsHttpClientFactoryTests.cs
@@ -1,5 +1,6 @@
using System.Security.Authentication;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.AnalyticsClient.Options;
using Microsoft.Extensions.Logging;
using Moq;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
index 19eb2d2..27ae055 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
@@ -6,6 +6,7 @@
using System.Text;
using Couchbase.AnalyticsClient.DI;
using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
using Couchbase.AnalyticsClient.Options;
using Couchbase.AnalyticsClient.Query;
using Moq.Protected;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/RetryUtilsTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/RetryUtilsTests.cs
index b7ff05b..bf7ab84 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/RetryUtilsTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/RetryUtilsTests.cs
@@ -1,4 +1,4 @@
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
using Xunit;
using Xunit.Abstractions;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
index ce2282d..646d045 100644
--- a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
+++ b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
@@ -1,5 +1,5 @@
using System.Text.Json;
-using Couchbase.AnalyticsClient.Results;
+using Couchbase.AnalyticsClient.Internal.Results;
using Couchbase.Text.Json;
using Moq;
using Xunit;