konfjs · shinebayar-g · Feb 7, 2025 · Feb 7, 2025
diff --git a/Makefile b/Makefile
@@ -10,10 +10,6 @@ k8sUnusedOpenApiFiles := \
 	"version_openapi.json"
 
 
-.PHONY: all
-all: download-schema parse-schema models core
-
-
 # Download Kubernetes OpenAPI schemas to packages/cli/input-spec/*.json
 .PHONY: download-schema
 download-schema:

diff --git a/packages/cli/src/moveCore.ts b/packages/cli/src/moveCore.ts
@@ -26,14 +26,16 @@ function main() {
     for (const sourceFile of project.getSourceFiles()) {
         if (sourceFile.getDirectoryPath().startsWith(modelsPath)) {
             const fileName = sourceFile.getBaseNameWithoutExtension();
-            const schema = schemas.classes[fileName] ?? schemas.interfaces[fileName];
+            const classSchema = schemas.classes[fileName];
+            const interfaceSchema = schemas.interfaces[fileName];
+            const schema = classSchema ?? interfaceSchema;
 
             /**
              * In the OpenAPI spec file, classes contain .k8s.io, interfaces doesn't.
              * Also, flowcontrol.apiserver.k8s.io is used in classes,
              * but flowcontrol was used in interfaces.
              */
-            const destDir = path.join(
+            let destDir = path.join(
                 modelsPath,
                 schema.group
                     .replace('.k8s.io', '')
@@ -42,6 +44,10 @@ function main() {
                 schema.version,
             );
 
+            if (interfaceSchema) {
+                destDir = path.join(destDir, 'types');
+            }
+
             if (!fs.existsSync(destDir)) {
                 log(`Creating directory ${pc.blueBright(destDir)}`);
                 fs.mkdirSync(destDir, { recursive: true });

diff --git a/packages/core/src/ApiObject.ts b/packages/core/src/ApiObject.ts
@@ -1,5 +1,5 @@
 import * as yaml from 'yaml';
-import { ObjectMeta } from './models/meta/v1/ObjectMeta';
+import { ObjectMeta } from './models/meta/v1/types/ObjectMeta';
 
 export interface NamespacedObjectMeta extends ObjectMeta {
     /**

diff --git a/packages/core/src/Helm.ts b/packages/core/src/Helm.ts
@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import * as yaml from 'yaml';
 import { ApiObject } from './ApiObject.js';
 import { K8sApp } from './K8sApp.js';
-import { ObjectMeta } from './models/meta/v1/ObjectMeta';
+import { ObjectMeta } from './models/meta/v1/types/ObjectMeta';
 
 interface HelmObjectArgs {
     readonly apiVersion: string;

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,4 +1,4 @@
 export * from './ApiObject.js';
 export * from './K8sApp.js';
-export * from './models/meta/v1/ObjectMeta';
+export * from './models/meta/v1/types/ObjectMeta';
 export * from './Helm.js';
diff --git a/packages/core/src/models/admissionregistration/v1/MutatingWebhookConfiguration.ts b/packages/core/src/models/admissionregistration/v1/MutatingWebhookConfiguration.ts
@@ -1,5 +1,5 @@
-import { MutatingWebhook } from './MutatingWebhook';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { MutatingWebhook } from './types/MutatingWebhook';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/admissionregistration/v1/ValidatingAdmissionPolicy.ts b/packages/core/src/models/admissionregistration/v1/ValidatingAdmissionPolicy.ts
@@ -1,5 +1,5 @@
-import { ValidatingAdmissionPolicySpec } from './ValidatingAdmissionPolicySpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ValidatingAdmissionPolicySpec } from './types/ValidatingAdmissionPolicySpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/admissionregistration/v1/ValidatingAdmissionPolicyBinding.ts b/packages/core/src/models/admissionregistration/v1/ValidatingAdmissionPolicyBinding.ts
@@ -1,5 +1,5 @@
-import { ValidatingAdmissionPolicyBindingSpec } from './ValidatingAdmissionPolicyBindingSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ValidatingAdmissionPolicyBindingSpec } from './types/ValidatingAdmissionPolicyBindingSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/admissionregistration/v1/ValidatingWebhookConfiguration.ts b/packages/core/src/models/admissionregistration/v1/ValidatingWebhookConfiguration.ts
@@ -1,5 +1,5 @@
-import { ValidatingWebhook } from './ValidatingWebhook';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ValidatingWebhook } from './types/ValidatingWebhook';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...missionregistration/v1/AuditAnnotation.ts → ...nregistration/v1/types/AuditAnnotation.ts b/...missionregistration/v1/AuditAnnotation.ts → ...nregistration/v1/types/AuditAnnotation.ts
diff --git a/...dmissionregistration/v1/MatchCondition.ts → ...onregistration/v1/types/MatchCondition.ts b/...dmissionregistration/v1/MatchCondition.ts → ...onregistration/v1/types/MatchCondition.ts
diff --git a/...dmissionregistration/v1/MatchResources.ts → ...onregistration/v1/types/MatchResources.ts b/...dmissionregistration/v1/MatchResources.ts → ...onregistration/v1/types/MatchResources.ts
@@ -1,5 +1,5 @@
 import { NamedRuleWithOperations } from './NamedRuleWithOperations';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * MatchResources decides whether to run the admission control policy on an object based on whether it meets the match criteria. The exclude rules take precedence over include rules (if a resource matches both, it is excluded)

diff --git a/...missionregistration/v1/MutatingWebhook.ts → ...nregistration/v1/types/MutatingWebhook.ts b/...missionregistration/v1/MutatingWebhook.ts → ...nregistration/v1/types/MutatingWebhook.ts
@@ -1,7 +1,7 @@
 import { MatchCondition } from './MatchCondition';
 import { RuleWithOperations } from './RuleWithOperations';
 import { WebhookClientConfig } from './WebhookClientConfig';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * MutatingWebhook describes an admission webhook and the resources and operations it applies to.

diff --git a/...egistration/v1/NamedRuleWithOperations.ts → ...ation/v1/types/NamedRuleWithOperations.ts b/...egistration/v1/NamedRuleWithOperations.ts → ...ation/v1/types/NamedRuleWithOperations.ts
diff --git a/...els/admissionregistration/v1/ParamKind.ts → ...missionregistration/v1/types/ParamKind.ts b/...els/admissionregistration/v1/ParamKind.ts → ...missionregistration/v1/types/ParamKind.ts
diff --git a/...admissionregistration/v1beta1/ParamRef.ts → ...dmissionregistration/v1/types/ParamRef.ts b/...admissionregistration/v1beta1/ParamRef.ts → ...dmissionregistration/v1/types/ParamRef.ts
@@ -1,4 +1,4 @@
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * ParamRef describes how to locate the params to be used as input to expressions of rules applied by a policy binding.

diff --git a/...sionregistration/v1/RuleWithOperations.ts → ...gistration/v1/types/RuleWithOperations.ts b/...sionregistration/v1/RuleWithOperations.ts → ...gistration/v1/types/RuleWithOperations.ts
diff --git a/...issionregistration/v1/ServiceReference.ts → ...registration/v1/types/ServiceReference.ts b/...issionregistration/v1/ServiceReference.ts → ...registration/v1/types/ServiceReference.ts
diff --git a/...1/ValidatingAdmissionPolicyBindingSpec.ts → ...s/ValidatingAdmissionPolicyBindingSpec.ts b/...1/ValidatingAdmissionPolicyBindingSpec.ts → ...s/ValidatingAdmissionPolicyBindingSpec.ts
diff --git a/...ation/v1/ValidatingAdmissionPolicySpec.ts → ...v1/types/ValidatingAdmissionPolicySpec.ts b/...ation/v1/ValidatingAdmissionPolicySpec.ts → ...v1/types/ValidatingAdmissionPolicySpec.ts
diff --git a/...ssionregistration/v1/ValidatingWebhook.ts → ...egistration/v1/types/ValidatingWebhook.ts b/...ssionregistration/v1/ValidatingWebhook.ts → ...egistration/v1/types/ValidatingWebhook.ts
@@ -1,7 +1,7 @@
 import { MatchCondition } from './MatchCondition';
 import { RuleWithOperations } from './RuleWithOperations';
 import { WebhookClientConfig } from './WebhookClientConfig';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * ValidatingWebhook describes an admission webhook and the resources and operations it applies to.

diff --git a/...ls/admissionregistration/v1/Validation.ts → ...issionregistration/v1/types/Validation.ts b/...ls/admissionregistration/v1/Validation.ts → ...issionregistration/v1/types/Validation.ts
diff --git a/...dels/admissionregistration/v1/Variable.ts → ...dmissionregistration/v1/types/Variable.ts b/...dels/admissionregistration/v1/Variable.ts → ...dmissionregistration/v1/types/Variable.ts
diff --git a/...ionregistration/v1/WebhookClientConfig.ts → ...istration/v1/types/WebhookClientConfig.ts b/...ionregistration/v1/WebhookClientConfig.ts → ...istration/v1/types/WebhookClientConfig.ts
diff --git a/packages/core/src/models/admissionregistration/v1alpha1/MutatingAdmissionPolicy.ts b/packages/core/src/models/admissionregistration/v1alpha1/MutatingAdmissionPolicy.ts
@@ -1,5 +1,5 @@
-import { MutatingAdmissionPolicySpec } from './MutatingAdmissionPolicySpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { MutatingAdmissionPolicySpec } from './types/MutatingAdmissionPolicySpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/admissionregistration/v1alpha1/MutatingAdmissionPolicyBinding.ts b/packages/core/src/models/admissionregistration/v1alpha1/MutatingAdmissionPolicyBinding.ts
@@ -1,5 +1,5 @@
-import { MutatingAdmissionPolicyBindingSpec } from './MutatingAdmissionPolicyBindingSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { MutatingAdmissionPolicyBindingSpec } from './types/MutatingAdmissionPolicyBindingSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...gistration/v1alpha1/ApplyConfiguration.ts → ...tion/v1alpha1/types/ApplyConfiguration.ts b/...gistration/v1alpha1/ApplyConfiguration.ts → ...tion/v1alpha1/types/ApplyConfiguration.ts
diff --git a/...missionregistration/v1alpha1/JSONPatch.ts → ...nregistration/v1alpha1/types/JSONPatch.ts b/...missionregistration/v1alpha1/JSONPatch.ts → ...nregistration/v1alpha1/types/JSONPatch.ts
diff --git a/...onregistration/v1alpha1/MatchCondition.ts → ...stration/v1alpha1/types/MatchCondition.ts b/...onregistration/v1alpha1/MatchCondition.ts → ...stration/v1alpha1/types/MatchCondition.ts
diff --git a/...ionregistration/v1beta1/MatchResources.ts → ...stration/v1alpha1/types/MatchResources.ts b/...ionregistration/v1beta1/MatchResources.ts → ...stration/v1alpha1/types/MatchResources.ts
@@ -1,5 +1,5 @@
 import { NamedRuleWithOperations } from './NamedRuleWithOperations';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * MatchResources decides whether to run the admission control policy on an object based on whether it meets the match criteria. The exclude rules take precedence over include rules (if a resource matches both, it is excluded)

diff --git a/...ha1/MutatingAdmissionPolicyBindingSpec.ts → ...pes/MutatingAdmissionPolicyBindingSpec.ts b/...ha1/MutatingAdmissionPolicyBindingSpec.ts → ...pes/MutatingAdmissionPolicyBindingSpec.ts
diff --git a/...n/v1alpha1/MutatingAdmissionPolicySpec.ts → ...pha1/types/MutatingAdmissionPolicySpec.ts b/...n/v1alpha1/MutatingAdmissionPolicySpec.ts → ...pha1/types/MutatingAdmissionPolicySpec.ts
diff --git a/...dmissionregistration/v1alpha1/Mutation.ts → ...onregistration/v1alpha1/types/Mutation.ts b/...dmissionregistration/v1alpha1/Mutation.ts → ...onregistration/v1alpha1/types/Mutation.ts
diff --git a/...ation/v1alpha1/NamedRuleWithOperations.ts → ...v1alpha1/types/NamedRuleWithOperations.ts b/...ation/v1alpha1/NamedRuleWithOperations.ts → ...v1alpha1/types/NamedRuleWithOperations.ts
diff --git a/...missionregistration/v1alpha1/ParamKind.ts → ...nregistration/v1alpha1/types/ParamKind.ts b/...missionregistration/v1alpha1/ParamKind.ts → ...nregistration/v1alpha1/types/ParamKind.ts
diff --git a/...dmissionregistration/v1alpha1/ParamRef.ts → ...onregistration/v1alpha1/types/ParamRef.ts b/...dmissionregistration/v1alpha1/ParamRef.ts → ...onregistration/v1alpha1/types/ParamRef.ts
@@ -1,4 +1,4 @@
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * ParamRef describes how to locate the params to be used as input to expressions of rules applied by a policy binding.

diff --git a/...dmissionregistration/v1alpha1/Variable.ts → ...onregistration/v1alpha1/types/Variable.ts b/...dmissionregistration/v1alpha1/Variable.ts → ...onregistration/v1alpha1/types/Variable.ts
diff --git a/packages/core/src/models/admissionregistration/v1beta1/ValidatingAdmissionPolicy.ts b/packages/core/src/models/admissionregistration/v1beta1/ValidatingAdmissionPolicy.ts
@@ -1,5 +1,5 @@
-import { ValidatingAdmissionPolicySpec } from './ValidatingAdmissionPolicySpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ValidatingAdmissionPolicySpec } from './types/ValidatingAdmissionPolicySpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.ts b/packages/core/src/models/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.ts
@@ -1,5 +1,5 @@
-import { ValidatingAdmissionPolicyBindingSpec } from './ValidatingAdmissionPolicyBindingSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ValidatingAdmissionPolicyBindingSpec } from './types/ValidatingAdmissionPolicyBindingSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...onregistration/v1beta1/AuditAnnotation.ts → ...stration/v1beta1/types/AuditAnnotation.ts b/...onregistration/v1beta1/AuditAnnotation.ts → ...stration/v1beta1/types/AuditAnnotation.ts
diff --git a/...ionregistration/v1beta1/MatchCondition.ts → ...istration/v1beta1/types/MatchCondition.ts b/...ionregistration/v1beta1/MatchCondition.ts → ...istration/v1beta1/types/MatchCondition.ts
diff --git a/...onregistration/v1alpha1/MatchResources.ts → ...istration/v1beta1/types/MatchResources.ts b/...onregistration/v1alpha1/MatchResources.ts → ...istration/v1beta1/types/MatchResources.ts
@@ -1,5 +1,5 @@
 import { NamedRuleWithOperations } from './NamedRuleWithOperations';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * MatchResources decides whether to run the admission control policy on an object based on whether it meets the match criteria. The exclude rules take precedence over include rules (if a resource matches both, it is excluded)

diff --git a/...ration/v1beta1/NamedRuleWithOperations.ts → .../v1beta1/types/NamedRuleWithOperations.ts b/...ration/v1beta1/NamedRuleWithOperations.ts → .../v1beta1/types/NamedRuleWithOperations.ts
diff --git a/...dmissionregistration/v1beta1/ParamKind.ts → ...onregistration/v1beta1/types/ParamKind.ts b/...dmissionregistration/v1beta1/ParamKind.ts → ...onregistration/v1beta1/types/ParamKind.ts
diff --git a/...dels/admissionregistration/v1/ParamRef.ts → ...ionregistration/v1beta1/types/ParamRef.ts b/...dels/admissionregistration/v1/ParamRef.ts → ...ionregistration/v1beta1/types/ParamRef.ts
@@ -1,4 +1,4 @@
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * ParamRef describes how to locate the params to be used as input to expressions of rules applied by a policy binding.

diff --git a/...1/ValidatingAdmissionPolicyBindingSpec.ts → ...s/ValidatingAdmissionPolicyBindingSpec.ts b/...1/ValidatingAdmissionPolicyBindingSpec.ts → ...s/ValidatingAdmissionPolicyBindingSpec.ts
diff --git a/.../v1beta1/ValidatingAdmissionPolicySpec.ts → ...a1/types/ValidatingAdmissionPolicySpec.ts b/.../v1beta1/ValidatingAdmissionPolicySpec.ts → ...a1/types/ValidatingAdmissionPolicySpec.ts
diff --git a/...missionregistration/v1beta1/Validation.ts → ...nregistration/v1beta1/types/Validation.ts b/...missionregistration/v1beta1/Validation.ts → ...nregistration/v1beta1/types/Validation.ts
diff --git a/...admissionregistration/v1beta1/Variable.ts → ...ionregistration/v1beta1/types/Variable.ts b/...admissionregistration/v1beta1/Variable.ts → ...ionregistration/v1beta1/types/Variable.ts
diff --git a/packages/core/src/models/apiextensions/v1/CustomResourceDefinition.ts b/packages/core/src/models/apiextensions/v1/CustomResourceDefinition.ts
@@ -1,5 +1,5 @@
-import { CustomResourceDefinitionSpec } from './CustomResourceDefinitionSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { CustomResourceDefinitionSpec } from './types/CustomResourceDefinitionSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...ions/v1/CustomResourceColumnDefinition.ts → ...1/types/CustomResourceColumnDefinition.ts b/...ions/v1/CustomResourceColumnDefinition.ts → ...1/types/CustomResourceColumnDefinition.ts
diff --git a/...extensions/v1/CustomResourceConversion.ts → ...ions/v1/types/CustomResourceConversion.ts b/...extensions/v1/CustomResourceConversion.ts → ...ions/v1/types/CustomResourceConversion.ts
diff --git a/...sions/v1/CustomResourceDefinitionNames.ts → ...v1/types/CustomResourceDefinitionNames.ts b/...sions/v1/CustomResourceDefinitionNames.ts → ...v1/types/CustomResourceDefinitionNames.ts
diff --git a/...nsions/v1/CustomResourceDefinitionSpec.ts → .../v1/types/CustomResourceDefinitionSpec.ts b/...nsions/v1/CustomResourceDefinitionSpec.ts → .../v1/types/CustomResourceDefinitionSpec.ts
diff --git a/...ons/v1/CustomResourceDefinitionVersion.ts → .../types/CustomResourceDefinitionVersion.ts b/...ons/v1/CustomResourceDefinitionVersion.ts → .../types/CustomResourceDefinitionVersion.ts
diff --git a/...ions/v1/CustomResourceSubresourceScale.ts → ...1/types/CustomResourceSubresourceScale.ts b/...ions/v1/CustomResourceSubresourceScale.ts → ...1/types/CustomResourceSubresourceScale.ts
diff --git a/...tensions/v1/CustomResourceSubresources.ts → ...ns/v1/types/CustomResourceSubresources.ts b/...tensions/v1/CustomResourceSubresources.ts → ...ns/v1/types/CustomResourceSubresources.ts
diff --git a/...extensions/v1/CustomResourceValidation.ts → ...ions/v1/types/CustomResourceValidation.ts b/...extensions/v1/CustomResourceValidation.ts → ...ions/v1/types/CustomResourceValidation.ts
diff --git a/...apiextensions/v1/ExternalDocumentation.ts → ...ensions/v1/types/ExternalDocumentation.ts b/...apiextensions/v1/ExternalDocumentation.ts → ...ensions/v1/types/ExternalDocumentation.ts
diff --git a/...odels/apiextensions/v1/JSONSchemaProps.ts → ...apiextensions/v1/types/JSONSchemaProps.ts b/...odels/apiextensions/v1/JSONSchemaProps.ts → ...apiextensions/v1/types/JSONSchemaProps.ts
diff --git a/...odels/apiextensions/v1/SelectableField.ts → ...apiextensions/v1/types/SelectableField.ts b/...odels/apiextensions/v1/SelectableField.ts → ...apiextensions/v1/types/SelectableField.ts
diff --git a/...dels/apiextensions/v1/ServiceReference.ts → ...piextensions/v1/types/ServiceReference.ts b/...dels/apiextensions/v1/ServiceReference.ts → ...piextensions/v1/types/ServiceReference.ts
diff --git a/...models/apiextensions/v1/ValidationRule.ts → .../apiextensions/v1/types/ValidationRule.ts b/...models/apiextensions/v1/ValidationRule.ts → .../apiextensions/v1/types/ValidationRule.ts
diff --git a/...s/apiextensions/v1/WebhookClientConfig.ts → ...xtensions/v1/types/WebhookClientConfig.ts b/...s/apiextensions/v1/WebhookClientConfig.ts → ...xtensions/v1/types/WebhookClientConfig.ts
diff --git a/...els/apiextensions/v1/WebhookConversion.ts → ...iextensions/v1/types/WebhookConversion.ts b/...els/apiextensions/v1/WebhookConversion.ts → ...iextensions/v1/types/WebhookConversion.ts
diff --git a/packages/core/src/models/apiregistration/v1/APIService.ts b/packages/core/src/models/apiregistration/v1/APIService.ts
@@ -1,5 +1,5 @@
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
-import { APIServiceSpec } from './APIServiceSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
+import { APIServiceSpec } from './types/APIServiceSpec';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...dels/apiregistration/v1/APIServiceSpec.ts → ...piregistration/v1/types/APIServiceSpec.ts b/...dels/apiregistration/v1/APIServiceSpec.ts → ...piregistration/v1/types/APIServiceSpec.ts
diff --git a/...ls/apiregistration/v1/ServiceReference.ts → ...registration/v1/types/ServiceReference.ts b/...ls/apiregistration/v1/ServiceReference.ts → ...registration/v1/types/ServiceReference.ts
diff --git a/packages/core/src/models/apps/v1/DaemonSet.ts b/packages/core/src/models/apps/v1/DaemonSet.ts
@@ -1,4 +1,4 @@
-import { DaemonSetSpec } from './DaemonSetSpec';
+import { DaemonSetSpec } from './types/DaemonSetSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/apps/v1/Deployment.ts b/packages/core/src/models/apps/v1/Deployment.ts
@@ -1,4 +1,4 @@
-import { DeploymentSpec } from './DeploymentSpec';
+import { DeploymentSpec } from './types/DeploymentSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/apps/v1/ReplicaSet.ts b/packages/core/src/models/apps/v1/ReplicaSet.ts
@@ -1,4 +1,4 @@
-import { ReplicaSetSpec } from './ReplicaSetSpec';
+import { ReplicaSetSpec } from './types/ReplicaSetSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/apps/v1/StatefulSet.ts b/packages/core/src/models/apps/v1/StatefulSet.ts
@@ -1,4 +1,4 @@
-import { StatefulSetSpec } from './StatefulSetSpec';
+import { StatefulSetSpec } from './types/StatefulSetSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/.../core/src/models/apps/v1/DaemonSetSpec.ts → ...src/models/apps/v1/types/DaemonSetSpec.ts b/.../core/src/models/apps/v1/DaemonSetSpec.ts → ...src/models/apps/v1/types/DaemonSetSpec.ts
@@ -1,6 +1,6 @@
 import { DaemonSetUpdateStrategy } from './DaemonSetUpdateStrategy';
-import { PodTemplateSpec } from '../../v1/PodTemplateSpec';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { PodTemplateSpec } from '../../../v1/types/PodTemplateSpec';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * DaemonSetSpec is the specification of a daemon set.

diff --git a/...models/apps/v1/DaemonSetUpdateStrategy.ts → .../apps/v1/types/DaemonSetUpdateStrategy.ts b/...models/apps/v1/DaemonSetUpdateStrategy.ts → .../apps/v1/types/DaemonSetUpdateStrategy.ts
diff --git a/...core/src/models/apps/v1/DeploymentSpec.ts → ...rc/models/apps/v1/types/DeploymentSpec.ts b/...core/src/models/apps/v1/DeploymentSpec.ts → ...rc/models/apps/v1/types/DeploymentSpec.ts
@@ -1,6 +1,6 @@
 import { DeploymentStrategy } from './DeploymentStrategy';
-import { PodTemplateSpec } from '../../v1/PodTemplateSpec';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { PodTemplateSpec } from '../../../v1/types/PodTemplateSpec';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * DeploymentSpec is the specification of the desired behavior of the Deployment.

diff --git a/.../src/models/apps/v1/DeploymentStrategy.ts → ...odels/apps/v1/types/DeploymentStrategy.ts b/.../src/models/apps/v1/DeploymentStrategy.ts → ...odels/apps/v1/types/DeploymentStrategy.ts
diff --git a/...core/src/models/apps/v1/ReplicaSetSpec.ts → ...rc/models/apps/v1/types/ReplicaSetSpec.ts b/...core/src/models/apps/v1/ReplicaSetSpec.ts → ...rc/models/apps/v1/types/ReplicaSetSpec.ts
@@ -1,5 +1,5 @@
-import { PodTemplateSpec } from '../../v1/PodTemplateSpec';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { PodTemplateSpec } from '../../../v1/types/PodTemplateSpec';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * ReplicaSetSpec is the specification of a ReplicaSet.

diff --git a/.../models/apps/v1/RollingUpdateDaemonSet.ts → ...s/apps/v1/types/RollingUpdateDaemonSet.ts b/.../models/apps/v1/RollingUpdateDaemonSet.ts → ...s/apps/v1/types/RollingUpdateDaemonSet.ts
diff --git a/...models/apps/v1/RollingUpdateDeployment.ts → .../apps/v1/types/RollingUpdateDeployment.ts b/...models/apps/v1/RollingUpdateDeployment.ts → .../apps/v1/types/RollingUpdateDeployment.ts
diff --git a/...ps/v1/RollingUpdateStatefulSetStrategy.ts → ...types/RollingUpdateStatefulSetStrategy.ts b/...ps/v1/RollingUpdateStatefulSetStrategy.ts → ...types/RollingUpdateStatefulSetStrategy.ts
diff --git a/...src/models/apps/v1/StatefulSetOrdinals.ts → ...dels/apps/v1/types/StatefulSetOrdinals.ts b/...src/models/apps/v1/StatefulSetOrdinals.ts → ...dels/apps/v1/types/StatefulSetOrdinals.ts
diff --git a/...etPersistentVolumeClaimRetentionPolicy.ts → ...etPersistentVolumeClaimRetentionPolicy.ts b/...etPersistentVolumeClaimRetentionPolicy.ts → ...etPersistentVolumeClaimRetentionPolicy.ts
diff --git a/...ore/src/models/apps/v1/StatefulSetSpec.ts → ...c/models/apps/v1/types/StatefulSetSpec.ts b/...ore/src/models/apps/v1/StatefulSetSpec.ts → ...c/models/apps/v1/types/StatefulSetSpec.ts
@@ -1,9 +1,9 @@
 import { StatefulSetOrdinals } from './StatefulSetOrdinals';
 import { StatefulSetPersistentVolumeClaimRetentionPolicy } from './StatefulSetPersistentVolumeClaimRetentionPolicy';
 import { StatefulSetUpdateStrategy } from './StatefulSetUpdateStrategy';
-import { PersistentVolumeClaim } from '../../v1/PersistentVolumeClaim';
-import { PodTemplateSpec } from '../../v1/PodTemplateSpec';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { PersistentVolumeClaim } from '../../../v1/PersistentVolumeClaim';
+import { PodTemplateSpec } from '../../../v1/types/PodTemplateSpec';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * A StatefulSetSpec is the specification of a StatefulSet.

diff --git a/...dels/apps/v1/StatefulSetUpdateStrategy.ts → ...pps/v1/types/StatefulSetUpdateStrategy.ts b/...dels/apps/v1/StatefulSetUpdateStrategy.ts → ...pps/v1/types/StatefulSetUpdateStrategy.ts
diff --git a/packages/core/src/models/autoscaling/v1/HorizontalPodAutoscaler.ts b/packages/core/src/models/autoscaling/v1/HorizontalPodAutoscaler.ts
@@ -1,4 +1,4 @@
-import { HorizontalPodAutoscalerSpec } from './HorizontalPodAutoscalerSpec';
+import { HorizontalPodAutoscalerSpec } from './types/HorizontalPodAutoscalerSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...scaling/v1/CrossVersionObjectReference.ts → ...g/v1/types/CrossVersionObjectReference.ts b/...scaling/v1/CrossVersionObjectReference.ts → ...g/v1/types/CrossVersionObjectReference.ts
diff --git a/...scaling/v1/HorizontalPodAutoscalerSpec.ts → ...g/v1/types/HorizontalPodAutoscalerSpec.ts b/...scaling/v1/HorizontalPodAutoscalerSpec.ts → ...g/v1/types/HorizontalPodAutoscalerSpec.ts
diff --git a/packages/core/src/models/autoscaling/v2/HorizontalPodAutoscaler.ts b/packages/core/src/models/autoscaling/v2/HorizontalPodAutoscaler.ts
@@ -1,4 +1,4 @@
-import { HorizontalPodAutoscalerSpec } from './HorizontalPodAutoscalerSpec';
+import { HorizontalPodAutoscalerSpec } from './types/HorizontalPodAutoscalerSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...aling/v2/ContainerResourceMetricSource.ts → ...v2/types/ContainerResourceMetricSource.ts b/...aling/v2/ContainerResourceMetricSource.ts → ...v2/types/ContainerResourceMetricSource.ts
diff --git a/...scaling/v2/CrossVersionObjectReference.ts → ...g/v2/types/CrossVersionObjectReference.ts b/...scaling/v2/CrossVersionObjectReference.ts → ...g/v2/types/CrossVersionObjectReference.ts
diff --git a/...ls/autoscaling/v2/ExternalMetricSource.ts → ...oscaling/v2/types/ExternalMetricSource.ts b/...ls/autoscaling/v2/ExternalMetricSource.ts → ...oscaling/v2/types/ExternalMetricSource.ts
diff --git a/...models/autoscaling/v2/HPAScalingPolicy.ts → .../autoscaling/v2/types/HPAScalingPolicy.ts b/...models/autoscaling/v2/HPAScalingPolicy.ts → .../autoscaling/v2/types/HPAScalingPolicy.ts
diff --git a/.../models/autoscaling/v2/HPAScalingRules.ts → ...s/autoscaling/v2/types/HPAScalingRules.ts b/.../models/autoscaling/v2/HPAScalingRules.ts → ...s/autoscaling/v2/types/HPAScalingRules.ts
diff --git a/...ing/v2/HorizontalPodAutoscalerBehavior.ts → .../types/HorizontalPodAutoscalerBehavior.ts b/...ing/v2/HorizontalPodAutoscalerBehavior.ts → .../types/HorizontalPodAutoscalerBehavior.ts
diff --git a/...scaling/v2/HorizontalPodAutoscalerSpec.ts → ...g/v2/types/HorizontalPodAutoscalerSpec.ts b/...scaling/v2/HorizontalPodAutoscalerSpec.ts → ...g/v2/types/HorizontalPodAutoscalerSpec.ts
diff --git a/...models/autoscaling/v2/MetricIdentifier.ts → .../autoscaling/v2/types/MetricIdentifier.ts b/...models/autoscaling/v2/MetricIdentifier.ts → .../autoscaling/v2/types/MetricIdentifier.ts
@@ -1,4 +1,4 @@
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * MetricIdentifier defines the name and optionally selector for a metric

diff --git a/...e/src/models/autoscaling/v2/MetricSpec.ts → ...models/autoscaling/v2/types/MetricSpec.ts b/...e/src/models/autoscaling/v2/MetricSpec.ts → ...models/autoscaling/v2/types/MetricSpec.ts
diff --git a/...src/models/autoscaling/v2/MetricTarget.ts → ...dels/autoscaling/v2/types/MetricTarget.ts b/...src/models/autoscaling/v2/MetricTarget.ts → ...dels/autoscaling/v2/types/MetricTarget.ts
diff --git a/...dels/autoscaling/v2/ObjectMetricSource.ts → ...utoscaling/v2/types/ObjectMetricSource.ts b/...dels/autoscaling/v2/ObjectMetricSource.ts → ...utoscaling/v2/types/ObjectMetricSource.ts
diff --git a/...models/autoscaling/v2/PodsMetricSource.ts → .../autoscaling/v2/types/PodsMetricSource.ts b/...models/autoscaling/v2/PodsMetricSource.ts → .../autoscaling/v2/types/PodsMetricSource.ts
diff --git a/...ls/autoscaling/v2/ResourceMetricSource.ts → ...oscaling/v2/types/ResourceMetricSource.ts b/...ls/autoscaling/v2/ResourceMetricSource.ts → ...oscaling/v2/types/ResourceMetricSource.ts
diff --git a/packages/core/src/models/batch/v1/CronJob.ts b/packages/core/src/models/batch/v1/CronJob.ts
@@ -1,4 +1,4 @@
-import { CronJobSpec } from './CronJobSpec';
+import { CronJobSpec } from './types/CronJobSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/batch/v1/Job.ts b/packages/core/src/models/batch/v1/Job.ts
@@ -1,4 +1,4 @@
-import { JobSpec } from './JobSpec';
+import { JobSpec } from './types/JobSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...s/core/src/models/batch/v1/CronJobSpec.ts → .../src/models/batch/v1/types/CronJobSpec.ts b/...s/core/src/models/batch/v1/CronJobSpec.ts → .../src/models/batch/v1/types/CronJobSpec.ts
diff --git a/packages/core/src/models/batch/v1/JobSpec.ts → ...core/src/models/batch/v1/types/JobSpec.ts b/packages/core/src/models/batch/v1/JobSpec.ts → ...core/src/models/batch/v1/types/JobSpec.ts
@@ -1,7 +1,7 @@
 import { PodFailurePolicy } from './PodFailurePolicy';
 import { SuccessPolicy } from './SuccessPolicy';
-import { PodTemplateSpec } from '../../v1/PodTemplateSpec';
-import { LabelSelector } from '../../meta/v1/LabelSelector';
+import { PodTemplateSpec } from '../../../v1/types/PodTemplateSpec';
+import { LabelSelector } from '../../../meta/v1/types/LabelSelector';
 
 /**
  * JobSpec describes how the job execution will look like.

diff --git a/...re/src/models/batch/v1/JobTemplateSpec.ts → .../models/batch/v1/types/JobTemplateSpec.ts b/...re/src/models/batch/v1/JobTemplateSpec.ts → .../models/batch/v1/types/JobTemplateSpec.ts
@@ -1,5 +1,5 @@
 import { JobSpec } from './JobSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ObjectMeta } from '../../../meta/v1/types/ObjectMeta';
 
 /**
  * JobTemplateSpec describes the data a Job should have when created from a template

diff --git a/...e/src/models/batch/v1/PodFailurePolicy.ts → ...models/batch/v1/types/PodFailurePolicy.ts b/...e/src/models/batch/v1/PodFailurePolicy.ts → ...models/batch/v1/types/PodFailurePolicy.ts
diff --git a/...PodFailurePolicyOnExitCodesRequirement.ts → ...PodFailurePolicyOnExitCodesRequirement.ts b/...PodFailurePolicyOnExitCodesRequirement.ts → ...PodFailurePolicyOnExitCodesRequirement.ts
diff --git a/...PodFailurePolicyOnPodConditionsPattern.ts → ...PodFailurePolicyOnPodConditionsPattern.ts b/...PodFailurePolicyOnPodConditionsPattern.ts → ...PodFailurePolicyOnPodConditionsPattern.ts
diff --git a/...c/models/batch/v1/PodFailurePolicyRule.ts → ...ls/batch/v1/types/PodFailurePolicyRule.ts b/...c/models/batch/v1/PodFailurePolicyRule.ts → ...ls/batch/v1/types/PodFailurePolicyRule.ts
diff --git a/...core/src/models/batch/v1/SuccessPolicy.ts → ...rc/models/batch/v1/types/SuccessPolicy.ts b/...core/src/models/batch/v1/SuccessPolicy.ts → ...rc/models/batch/v1/types/SuccessPolicy.ts
diff --git a/.../src/models/batch/v1/SuccessPolicyRule.ts → ...odels/batch/v1/types/SuccessPolicyRule.ts b/.../src/models/batch/v1/SuccessPolicyRule.ts → ...odels/batch/v1/types/SuccessPolicyRule.ts
diff --git a/packages/core/src/models/certificates/v1/CertificateSigningRequest.ts b/packages/core/src/models/certificates/v1/CertificateSigningRequest.ts
@@ -1,5 +1,5 @@
-import { CertificateSigningRequestSpec } from './CertificateSigningRequestSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { CertificateSigningRequestSpec } from './types/CertificateSigningRequestSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...cates/v1/CertificateSigningRequestSpec.ts → ...v1/types/CertificateSigningRequestSpec.ts b/...cates/v1/CertificateSigningRequestSpec.ts → ...v1/types/CertificateSigningRequestSpec.ts
diff --git a/packages/core/src/models/certificates/v1alpha1/ClusterTrustBundle.ts b/packages/core/src/models/certificates/v1alpha1/ClusterTrustBundle.ts
@@ -1,5 +1,5 @@
-import { ClusterTrustBundleSpec } from './ClusterTrustBundleSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { ClusterTrustBundleSpec } from './types/ClusterTrustBundleSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...icates/v1alpha1/ClusterTrustBundleSpec.ts → .../v1alpha1/types/ClusterTrustBundleSpec.ts b/...icates/v1alpha1/ClusterTrustBundleSpec.ts → .../v1alpha1/types/ClusterTrustBundleSpec.ts
diff --git a/packages/core/src/models/coordination/v1/Lease.ts b/packages/core/src/models/coordination/v1/Lease.ts
@@ -1,4 +1,4 @@
-import { LeaseSpec } from './LeaseSpec';
+import { LeaseSpec } from './types/LeaseSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...e/src/models/coordination/v1/LeaseSpec.ts → ...models/coordination/v1/types/LeaseSpec.ts b/...e/src/models/coordination/v1/LeaseSpec.ts → ...models/coordination/v1/types/LeaseSpec.ts
diff --git a/packages/core/src/models/coordination/v1alpha2/LeaseCandidate.ts b/packages/core/src/models/coordination/v1alpha2/LeaseCandidate.ts
@@ -1,4 +1,4 @@
-import { LeaseCandidateSpec } from './LeaseCandidateSpec';
+import { LeaseCandidateSpec } from './types/LeaseCandidateSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...ordination/v1alpha2/LeaseCandidateSpec.ts → ...tion/v1alpha2/types/LeaseCandidateSpec.ts b/...ordination/v1alpha2/LeaseCandidateSpec.ts → ...tion/v1alpha2/types/LeaseCandidateSpec.ts
diff --git a/packages/core/src/models/discovery/v1/EndpointSlice.ts b/packages/core/src/models/discovery/v1/EndpointSlice.ts
@@ -1,5 +1,5 @@
-import { Endpoint } from './Endpoint';
-import { EndpointPort } from './EndpointPort';
+import { Endpoint } from './types/Endpoint';
+import { EndpointPort } from './types/EndpointPort';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/.../core/src/models/discovery/v1/Endpoint.ts → ...src/models/discovery/v1/types/Endpoint.ts b/.../core/src/models/discovery/v1/Endpoint.ts → ...src/models/discovery/v1/types/Endpoint.ts
@@ -1,4 +1,4 @@
-import { ObjectReference } from '../../v1/ObjectReference';
+import { ObjectReference } from '../../../v1/types/ObjectReference';
 import { EndpointConditions } from './EndpointConditions';
 import { EndpointHints } from './EndpointHints';
 

diff --git a/...models/discovery/v1/EndpointConditions.ts → .../discovery/v1/types/EndpointConditions.ts b/...models/discovery/v1/EndpointConditions.ts → .../discovery/v1/types/EndpointConditions.ts
diff --git a/.../src/models/discovery/v1/EndpointHints.ts → ...odels/discovery/v1/types/EndpointHints.ts b/.../src/models/discovery/v1/EndpointHints.ts → ...odels/discovery/v1/types/EndpointHints.ts
diff --git a/...e/src/models/discovery/v1/EndpointPort.ts → ...models/discovery/v1/types/EndpointPort.ts b/...e/src/models/discovery/v1/EndpointPort.ts → ...models/discovery/v1/types/EndpointPort.ts
diff --git a/...s/core/src/models/discovery/v1/ForZone.ts → .../src/models/discovery/v1/types/ForZone.ts b/...s/core/src/models/discovery/v1/ForZone.ts → .../src/models/discovery/v1/types/ForZone.ts
diff --git a/packages/core/src/models/events/v1/Event.ts b/packages/core/src/models/events/v1/Event.ts
@@ -1,6 +1,6 @@
-import { EventSource } from '../../v1/EventSource';
-import { ObjectReference } from '../../v1/ObjectReference';
-import { EventSeries } from './EventSeries';
+import { EventSource } from '../../v1/types/EventSource';
+import { ObjectReference } from '../../v1/types/ObjectReference';
+import { EventSeries } from './types/EventSeries';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/.../core/src/models/events/v1/EventSeries.ts → ...src/models/events/v1/types/EventSeries.ts b/.../core/src/models/events/v1/EventSeries.ts → ...src/models/events/v1/types/EventSeries.ts
diff --git a/packages/core/src/models/flowcontrol/v1/FlowSchema.ts b/packages/core/src/models/flowcontrol/v1/FlowSchema.ts
@@ -1,5 +1,5 @@
-import { FlowSchemaSpec } from './FlowSchemaSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { FlowSchemaSpec } from './types/FlowSchemaSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/flowcontrol/v1/PriorityLevelConfiguration.ts b/packages/core/src/models/flowcontrol/v1/PriorityLevelConfiguration.ts
@@ -1,5 +1,5 @@
-import { PriorityLevelConfigurationSpec } from './PriorityLevelConfigurationSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { PriorityLevelConfigurationSpec } from './types/PriorityLevelConfigurationSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/...ol/v1/ExemptPriorityLevelConfiguration.ts → ...types/ExemptPriorityLevelConfiguration.ts b/...ol/v1/ExemptPriorityLevelConfiguration.ts → ...types/ExemptPriorityLevelConfiguration.ts
diff --git a/...flowcontrol/v1/FlowDistinguisherMethod.ts → ...ntrol/v1/types/FlowDistinguisherMethod.ts b/...flowcontrol/v1/FlowDistinguisherMethod.ts → ...ntrol/v1/types/FlowDistinguisherMethod.ts
diff --git a/...c/models/flowcontrol/v1/FlowSchemaSpec.ts → ...ls/flowcontrol/v1/types/FlowSchemaSpec.ts b/...c/models/flowcontrol/v1/FlowSchemaSpec.ts → ...ls/flowcontrol/v1/types/FlowSchemaSpec.ts
diff --git a/...src/models/flowcontrol/v1/GroupSubject.ts → ...dels/flowcontrol/v1/types/GroupSubject.ts b/...src/models/flowcontrol/v1/GroupSubject.ts → ...dels/flowcontrol/v1/types/GroupSubject.ts
diff --git a/...rc/models/flowcontrol/v1/LimitResponse.ts → ...els/flowcontrol/v1/types/LimitResponse.ts b/...rc/models/flowcontrol/v1/LimitResponse.ts → ...els/flowcontrol/v1/types/LimitResponse.ts
diff --git a/...l/v1/LimitedPriorityLevelConfiguration.ts → ...ypes/LimitedPriorityLevelConfiguration.ts b/...l/v1/LimitedPriorityLevelConfiguration.ts → ...ypes/LimitedPriorityLevelConfiguration.ts
diff --git a/...s/flowcontrol/v1/NonResourcePolicyRule.ts → ...control/v1/types/NonResourcePolicyRule.ts b/...s/flowcontrol/v1/NonResourcePolicyRule.ts → ...control/v1/types/NonResourcePolicyRule.ts
diff --git a/...flowcontrol/v1/PolicyRulesWithSubjects.ts → ...ntrol/v1/types/PolicyRulesWithSubjects.ts b/...flowcontrol/v1/PolicyRulesWithSubjects.ts → ...ntrol/v1/types/PolicyRulesWithSubjects.ts
diff --git a/...v1/PriorityLevelConfigurationReference.ts → ...es/PriorityLevelConfigurationReference.ts b/...v1/PriorityLevelConfigurationReference.ts → ...es/PriorityLevelConfigurationReference.ts
diff --git a/...trol/v1/PriorityLevelConfigurationSpec.ts → ...1/types/PriorityLevelConfigurationSpec.ts b/...trol/v1/PriorityLevelConfigurationSpec.ts → ...1/types/PriorityLevelConfigurationSpec.ts
diff --git a/...ls/flowcontrol/v1/QueuingConfiguration.ts → ...wcontrol/v1/types/QueuingConfiguration.ts b/...ls/flowcontrol/v1/QueuingConfiguration.ts → ...wcontrol/v1/types/QueuingConfiguration.ts
diff --git a/...dels/flowcontrol/v1/ResourcePolicyRule.ts → ...lowcontrol/v1/types/ResourcePolicyRule.ts b/...dels/flowcontrol/v1/ResourcePolicyRule.ts → ...lowcontrol/v1/types/ResourcePolicyRule.ts
diff --git a/...s/flowcontrol/v1/ServiceAccountSubject.ts → ...control/v1/types/ServiceAccountSubject.ts b/...s/flowcontrol/v1/ServiceAccountSubject.ts → ...control/v1/types/ServiceAccountSubject.ts
diff --git a/...core/src/models/flowcontrol/v1/Subject.ts → ...rc/models/flowcontrol/v1/types/Subject.ts b/...core/src/models/flowcontrol/v1/Subject.ts → ...rc/models/flowcontrol/v1/types/Subject.ts
diff --git a/.../src/models/flowcontrol/v1/UserSubject.ts → ...odels/flowcontrol/v1/types/UserSubject.ts b/.../src/models/flowcontrol/v1/UserSubject.ts → ...odels/flowcontrol/v1/types/UserSubject.ts
diff --git a/.../core/src/models/meta/v1/LabelSelector.ts → ...src/models/meta/v1/types/LabelSelector.ts b/.../core/src/models/meta/v1/LabelSelector.ts → ...src/models/meta/v1/types/LabelSelector.ts
diff --git a/...odels/meta/v1/LabelSelectorRequirement.ts → ...meta/v1/types/LabelSelectorRequirement.ts b/...odels/meta/v1/LabelSelectorRequirement.ts → ...meta/v1/types/LabelSelectorRequirement.ts
diff --git a/.../src/models/meta/v1/ManagedFieldsEntry.ts → ...odels/meta/v1/types/ManagedFieldsEntry.ts b/.../src/models/meta/v1/ManagedFieldsEntry.ts → ...odels/meta/v1/types/ManagedFieldsEntry.ts
diff --git a/...ges/core/src/models/meta/v1/ObjectMeta.ts → ...re/src/models/meta/v1/types/ObjectMeta.ts b/...ges/core/src/models/meta/v1/ObjectMeta.ts → ...re/src/models/meta/v1/types/ObjectMeta.ts
diff --git a/...core/src/models/meta/v1/OwnerReference.ts → ...rc/models/meta/v1/types/OwnerReference.ts b/...core/src/models/meta/v1/OwnerReference.ts → ...rc/models/meta/v1/types/OwnerReference.ts
diff --git a/packages/core/src/models/networking/v1/Ingress.ts b/packages/core/src/models/networking/v1/Ingress.ts
@@ -1,4 +1,4 @@
-import { IngressSpec } from './IngressSpec';
+import { IngressSpec } from './types/IngressSpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/networking/v1/IngressClass.ts b/packages/core/src/models/networking/v1/IngressClass.ts
@@ -1,5 +1,5 @@
-import { IngressClassSpec } from './IngressClassSpec';
-import { ObjectMeta } from '../../meta/v1/ObjectMeta';
+import { IngressClassSpec } from './types/IngressClassSpec';
+import { ObjectMeta } from '../../meta/v1/types/ObjectMeta';
 import { K8sApp } from '../../../K8sApp';
 import { ApiObject } from '../../../ApiObject';
 

diff --git a/packages/core/src/models/networking/v1/NetworkPolicy.ts b/packages/core/src/models/networking/v1/NetworkPolicy.ts
@@ -1,4 +1,4 @@
-import { NetworkPolicySpec } from './NetworkPolicySpec';
+import { NetworkPolicySpec } from './types/NetworkPolicySpec';
 import { K8sApp } from '../../../K8sApp';
 import { NamespacedObjectMeta, NamespacedApiObject } from '../../../ApiObject';
 

diff --git a/...c/models/networking/v1/HTTPIngressPath.ts → ...ls/networking/v1/types/HTTPIngressPath.ts b/...c/models/networking/v1/HTTPIngressPath.ts → ...ls/networking/v1/types/HTTPIngressPath.ts
diff --git a/...els/networking/v1/HTTPIngressRuleValue.ts → ...tworking/v1/types/HTTPIngressRuleValue.ts b/...els/networking/v1/HTTPIngressRuleValue.ts → ...tworking/v1/types/HTTPIngressRuleValue.ts
diff --git a/.../core/src/models/networking/v1/IPBlock.ts → ...src/models/networking/v1/types/IPBlock.ts b/.../core/src/models/networking/v1/IPBlock.ts → ...src/models/networking/v1/types/IPBlock.ts