diff --git a/src/KubernetesClient.Basic/AssemblyInfo.cs b/src/KubernetesClient.Basic/AssemblyInfo.cs
deleted file mode 100644
index b13544f39..000000000
--- a/src/KubernetesClient.Basic/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KubernetesClient")]
-[assembly: InternalsVisibleTo("KubernetesClient.Classic")]
-[assembly: InternalsVisibleTo("KubernetesClient.Tests")]
diff --git a/src/KubernetesClient.Basic/Global.cs b/src/KubernetesClient.Basic/Global.cs
deleted file mode 100644
index 69a1f6acd..000000000
--- a/src/KubernetesClient.Basic/Global.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-global using k8s.Autorest;
-global using k8s.Models;
-global using System;
-global using System.Collections.Generic;
-global using System.IO;
-global using System.Linq;
-global using System.Threading;
-global using System.Threading.Tasks;
diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
index 17a4a9968..0545ba591 100644
--- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
+++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
@@ -16,64 +16,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/KubernetesClient.Models/AssemblyInfo.cs b/src/KubernetesClient.Models/AssemblyInfo.cs
deleted file mode 100644
index e3f8177b5..000000000
--- a/src/KubernetesClient.Models/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KubernetesClient")]
-[assembly: InternalsVisibleTo("KubernetesClient.Classic")]
-[assembly: InternalsVisibleTo("KubernetesClient.Basic")]
-[assembly: InternalsVisibleTo("KubernetesClient.Tests")]
diff --git a/src/KubernetesClient.Models/Global.cs b/src/KubernetesClient.Models/Global.cs
deleted file mode 100644
index 70b3700e1..000000000
--- a/src/KubernetesClient.Models/Global.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-global using System;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Text.Json;
-global using System.Text.Json.Serialization;
diff --git a/src/KubernetesClient.Basic/AbstractKubernetes.cs b/src/KubernetesClient/AbstractKubernetes.cs
similarity index 100%
rename from src/KubernetesClient.Basic/AbstractKubernetes.cs
rename to src/KubernetesClient/AbstractKubernetes.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpExtensions.cs b/src/KubernetesClient/Autorest/HttpExtensions.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpExtensions.cs
rename to src/KubernetesClient/Autorest/HttpExtensions.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpMessageWrapper.cs b/src/KubernetesClient/Autorest/HttpMessageWrapper.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpMessageWrapper.cs
rename to src/KubernetesClient/Autorest/HttpMessageWrapper.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpOperationException.cs b/src/KubernetesClient/Autorest/HttpOperationException.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpOperationException.cs
rename to src/KubernetesClient/Autorest/HttpOperationException.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpOperationResponse.cs b/src/KubernetesClient/Autorest/HttpOperationResponse.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpOperationResponse.cs
rename to src/KubernetesClient/Autorest/HttpOperationResponse.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpRequestMessageWrapper.cs b/src/KubernetesClient/Autorest/HttpRequestMessageWrapper.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpRequestMessageWrapper.cs
rename to src/KubernetesClient/Autorest/HttpRequestMessageWrapper.cs
diff --git a/src/KubernetesClient.Basic/Autorest/HttpResponseMessageWrapper.cs b/src/KubernetesClient/Autorest/HttpResponseMessageWrapper.cs
similarity index 100%
rename from src/KubernetesClient.Basic/Autorest/HttpResponseMessageWrapper.cs
rename to src/KubernetesClient/Autorest/HttpResponseMessageWrapper.cs
diff --git a/src/KubernetesClient.Models/Extensions.cs b/src/KubernetesClient/Extensions.cs
similarity index 100%
rename from src/KubernetesClient.Models/Extensions.cs
rename to src/KubernetesClient/Extensions.cs
diff --git a/src/KubernetesClient.Models/FloatEmitter.cs b/src/KubernetesClient/FloatEmitter.cs
similarity index 100%
rename from src/KubernetesClient.Models/FloatEmitter.cs
rename to src/KubernetesClient/FloatEmitter.cs
diff --git a/src/KubernetesClient.Basic/GeneratedApiVersion.cs b/src/KubernetesClient/GeneratedApiVersion.cs
similarity index 100%
rename from src/KubernetesClient.Basic/GeneratedApiVersion.cs
rename to src/KubernetesClient/GeneratedApiVersion.cs
diff --git a/src/KubernetesClient.Models/IItems.cs b/src/KubernetesClient/IItems.cs
similarity index 100%
rename from src/KubernetesClient.Models/IItems.cs
rename to src/KubernetesClient/IItems.cs
diff --git a/src/KubernetesClient.Models/IKubernetesObject.cs b/src/KubernetesClient/IKubernetesObject.cs
similarity index 100%
rename from src/KubernetesClient.Models/IKubernetesObject.cs
rename to src/KubernetesClient/IKubernetesObject.cs
diff --git a/src/KubernetesClient.Models/IMetadata.cs b/src/KubernetesClient/IMetadata.cs
similarity index 100%
rename from src/KubernetesClient.Models/IMetadata.cs
rename to src/KubernetesClient/IMetadata.cs
diff --git a/src/KubernetesClient.Models/ISpec.cs b/src/KubernetesClient/ISpec.cs
similarity index 100%
rename from src/KubernetesClient.Models/ISpec.cs
rename to src/KubernetesClient/ISpec.cs
diff --git a/src/KubernetesClient.Models/IStatus.cs b/src/KubernetesClient/IStatus.cs
similarity index 100%
rename from src/KubernetesClient.Models/IStatus.cs
rename to src/KubernetesClient/IStatus.cs
diff --git a/src/KubernetesClient.Models/IValidate.cs b/src/KubernetesClient/IValidate.cs
similarity index 100%
rename from src/KubernetesClient.Models/IValidate.cs
rename to src/KubernetesClient/IValidate.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/AuthProvider.cs b/src/KubernetesClient/KubeConfigModels/AuthProvider.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/AuthProvider.cs
rename to src/KubernetesClient/KubeConfigModels/AuthProvider.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/Cluster.cs b/src/KubernetesClient/KubeConfigModels/Cluster.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/Cluster.cs
rename to src/KubernetesClient/KubeConfigModels/Cluster.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/ClusterEndpoint.cs b/src/KubernetesClient/KubeConfigModels/ClusterEndpoint.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/ClusterEndpoint.cs
rename to src/KubernetesClient/KubeConfigModels/ClusterEndpoint.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/Context.cs b/src/KubernetesClient/KubeConfigModels/Context.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/Context.cs
rename to src/KubernetesClient/KubeConfigModels/Context.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/ContextDetails.cs b/src/KubernetesClient/KubeConfigModels/ContextDetails.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/ContextDetails.cs
rename to src/KubernetesClient/KubeConfigModels/ContextDetails.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/ExecCredentialResponse.cs b/src/KubernetesClient/KubeConfigModels/ExecCredentialResponse.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/ExecCredentialResponse.cs
rename to src/KubernetesClient/KubeConfigModels/ExecCredentialResponse.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/ExternalExecution.cs b/src/KubernetesClient/KubeConfigModels/ExternalExecution.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/ExternalExecution.cs
rename to src/KubernetesClient/KubeConfigModels/ExternalExecution.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/K8SConfiguration.cs b/src/KubernetesClient/KubeConfigModels/K8SConfiguration.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/K8SConfiguration.cs
rename to src/KubernetesClient/KubeConfigModels/K8SConfiguration.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/NamedExtension.cs b/src/KubernetesClient/KubeConfigModels/NamedExtension.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/NamedExtension.cs
rename to src/KubernetesClient/KubeConfigModels/NamedExtension.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/User.cs b/src/KubernetesClient/KubeConfigModels/User.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/User.cs
rename to src/KubernetesClient/KubeConfigModels/User.cs
diff --git a/src/KubernetesClient.Models/KubeConfigModels/UserCredentials.cs b/src/KubernetesClient/KubeConfigModels/UserCredentials.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubeConfigModels/UserCredentials.cs
rename to src/KubernetesClient/KubeConfigModels/UserCredentials.cs
diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
index 73517f1f3..df1639143 100644
--- a/src/KubernetesClient/KubernetesClient.csproj
+++ b/src/KubernetesClient/KubernetesClient.csproj
@@ -17,67 +17,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/KubernetesClient.Models/KubernetesJson.cs b/src/KubernetesClient/KubernetesJson.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubernetesJson.cs
rename to src/KubernetesClient/KubernetesJson.cs
diff --git a/src/KubernetesClient.Models/KubernetesObject.cs b/src/KubernetesClient/KubernetesObject.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubernetesObject.cs
rename to src/KubernetesClient/KubernetesObject.cs
diff --git a/src/KubernetesClient.Models/KubernetesYaml.cs b/src/KubernetesClient/KubernetesYaml.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubernetesYaml.cs
rename to src/KubernetesClient/KubernetesYaml.cs
diff --git a/src/KubernetesClient.Models/ContainerMetrics.cs b/src/KubernetesClient/Models/ContainerMetrics.cs
similarity index 100%
rename from src/KubernetesClient.Models/ContainerMetrics.cs
rename to src/KubernetesClient/Models/ContainerMetrics.cs
diff --git a/src/KubernetesClient.Models/GeneratedModelVersion.cs b/src/KubernetesClient/Models/GeneratedModelVersion.cs
similarity index 100%
rename from src/KubernetesClient.Models/GeneratedModelVersion.cs
rename to src/KubernetesClient/Models/GeneratedModelVersion.cs
diff --git a/src/KubernetesClient.Models/IntOrStringJsonConverter.cs b/src/KubernetesClient/Models/IntOrStringJsonConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/IntOrStringJsonConverter.cs
rename to src/KubernetesClient/Models/IntOrStringJsonConverter.cs
diff --git a/src/KubernetesClient.Models/IntOrStringYamlConverter.cs b/src/KubernetesClient/Models/IntOrStringYamlConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/IntOrStringYamlConverter.cs
rename to src/KubernetesClient/Models/IntOrStringYamlConverter.cs
diff --git a/src/KubernetesClient.Models/IntstrIntOrString.cs b/src/KubernetesClient/Models/IntstrIntOrString.cs
similarity index 100%
rename from src/KubernetesClient.Models/IntstrIntOrString.cs
rename to src/KubernetesClient/Models/IntstrIntOrString.cs
diff --git a/src/KubernetesClient.Models/KubernetesEntityAttribute.cs b/src/KubernetesClient/Models/KubernetesEntityAttribute.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubernetesEntityAttribute.cs
rename to src/KubernetesClient/Models/KubernetesEntityAttribute.cs
diff --git a/src/KubernetesClient.Models/KubernetesList.cs b/src/KubernetesClient/Models/KubernetesList.cs
similarity index 100%
rename from src/KubernetesClient.Models/KubernetesList.cs
rename to src/KubernetesClient/Models/KubernetesList.cs
diff --git a/src/KubernetesClient.Models/ModelExtensions.cs b/src/KubernetesClient/Models/ModelExtensions.cs
similarity index 100%
rename from src/KubernetesClient.Models/ModelExtensions.cs
rename to src/KubernetesClient/Models/ModelExtensions.cs
diff --git a/src/KubernetesClient.Models/ModelVersionConverter.cs b/src/KubernetesClient/Models/ModelVersionConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/ModelVersionConverter.cs
rename to src/KubernetesClient/Models/ModelVersionConverter.cs
diff --git a/src/KubernetesClient.Models/NodeMetrics.cs b/src/KubernetesClient/Models/NodeMetrics.cs
similarity index 100%
rename from src/KubernetesClient.Models/NodeMetrics.cs
rename to src/KubernetesClient/Models/NodeMetrics.cs
diff --git a/src/KubernetesClient.Models/NodeMetricsList.cs b/src/KubernetesClient/Models/NodeMetricsList.cs
similarity index 100%
rename from src/KubernetesClient.Models/NodeMetricsList.cs
rename to src/KubernetesClient/Models/NodeMetricsList.cs
diff --git a/src/KubernetesClient.Models/PodMetrics.cs b/src/KubernetesClient/Models/PodMetrics.cs
similarity index 100%
rename from src/KubernetesClient.Models/PodMetrics.cs
rename to src/KubernetesClient/Models/PodMetrics.cs
diff --git a/src/KubernetesClient.Models/PodMetricsList.cs b/src/KubernetesClient/Models/PodMetricsList.cs
similarity index 100%
rename from src/KubernetesClient.Models/PodMetricsList.cs
rename to src/KubernetesClient/Models/PodMetricsList.cs
diff --git a/src/KubernetesClient.Models/ResourceQuantity.cs b/src/KubernetesClient/Models/ResourceQuantity.cs
similarity index 100%
rename from src/KubernetesClient.Models/ResourceQuantity.cs
rename to src/KubernetesClient/Models/ResourceQuantity.cs
diff --git a/src/KubernetesClient.Models/ResourceQuantityJsonConverter.cs b/src/KubernetesClient/Models/ResourceQuantityJsonConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/ResourceQuantityJsonConverter.cs
rename to src/KubernetesClient/Models/ResourceQuantityJsonConverter.cs
diff --git a/src/KubernetesClient.Models/ResourceQuantityYamlConverter.cs b/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/ResourceQuantityYamlConverter.cs
rename to src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs
diff --git a/src/KubernetesClient.Models/V1Patch.cs b/src/KubernetesClient/Models/V1Patch.cs
similarity index 100%
rename from src/KubernetesClient.Models/V1Patch.cs
rename to src/KubernetesClient/Models/V1Patch.cs
diff --git a/src/KubernetesClient.Models/V1PatchJsonConverter.cs b/src/KubernetesClient/Models/V1PatchJsonConverter.cs
similarity index 100%
rename from src/KubernetesClient.Models/V1PatchJsonConverter.cs
rename to src/KubernetesClient/Models/V1PatchJsonConverter.cs
diff --git a/src/KubernetesClient.Models/V1PodTemplateSpec.cs b/src/KubernetesClient/Models/V1PodTemplateSpec.cs
similarity index 100%
rename from src/KubernetesClient.Models/V1PodTemplateSpec.cs
rename to src/KubernetesClient/Models/V1PodTemplateSpec.cs
diff --git a/src/KubernetesClient.Models/V1Status.ObjectView.cs b/src/KubernetesClient/Models/V1Status.ObjectView.cs
similarity index 100%
rename from src/KubernetesClient.Models/V1Status.ObjectView.cs
rename to src/KubernetesClient/Models/V1Status.ObjectView.cs
diff --git a/src/KubernetesClient.Models/V1Status.cs b/src/KubernetesClient/Models/V1Status.cs
similarity index 100%
rename from src/KubernetesClient.Models/V1Status.cs
rename to src/KubernetesClient/Models/V1Status.cs
diff --git a/src/KubernetesClient.Models/StringQuotingEmitter.cs b/src/KubernetesClient/StringQuotingEmitter.cs
similarity index 100%
rename from src/KubernetesClient.Models/StringQuotingEmitter.cs
rename to src/KubernetesClient/StringQuotingEmitter.cs