diff --git a/packages/clients/src/api/account/index.ts b/packages/clients/src/api/account/index.ts
index 1f848dd15..54205ccfb 100644
--- a/packages/clients/src/api/account/index.ts
+++ b/packages/clients/src/api/account/index.ts
@@ -1,2 +1,2 @@
 export * as v2alpha1 from './v2alpha1'
-export * as v2 from './v2'
+export * as v2 from './v2/index.gen'
diff --git a/packages/clients/src/api/account/v2/api.gen.ts b/packages/clients/src/api/account/v2/api.gen.ts
index fc70fdb50..c8e18790e 100644
--- a/packages/clients/src/api/account/v2/api.gen.ts
+++ b/packages/clients/src/api/account/v2/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -31,7 +31,7 @@ const jsonContentHeaders = {
  *
  * This API allows you to manage projects.
  */
-export class AccountV2GenAPI extends API {
+export class API extends ParentAPI {
   /**
    * Create project
    *
diff --git a/packages/clients/src/api/account/v2/index.gen.ts b/packages/clients/src/api/account/v2/index.gen.ts
new file mode 100644
index 000000000..a45978e27
--- /dev/null
+++ b/packages/clients/src/api/account/v2/index.gen.ts
@@ -0,0 +1,13 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  CreateProjectRequest,
+  DeleteProjectRequest,
+  GetProjectRequest,
+  ListProjectsRequest,
+  ListProjectsRequestOrderBy,
+  ListProjectsResponse,
+  Project,
+  UpdateProjectRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/account/v2/index.ts b/packages/clients/src/api/account/v2/index.ts
deleted file mode 100644
index 01e1ccd35..000000000
--- a/packages/clients/src/api/account/v2/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { AccountV2GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/applesilicon/index.ts b/packages/clients/src/api/applesilicon/index.ts
index e6671523d..e49bded05 100644
--- a/packages/clients/src/api/applesilicon/index.ts
+++ b/packages/clients/src/api/applesilicon/index.ts
@@ -1 +1 @@
-export * as v1alpha1 from './v1alpha1'
+export * as v1alpha1 from './v1alpha1/index.gen'
diff --git a/packages/clients/src/api/applesilicon/v1alpha1/api.gen.ts b/packages/clients/src/api/applesilicon/v1alpha1/api.gen.ts
index 7bc0146ba..a7ba623b0 100644
--- a/packages/clients/src/api/applesilicon/v1alpha1/api.gen.ts
+++ b/packages/clients/src/api/applesilicon/v1alpha1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -64,7 +64,7 @@ const jsonContentHeaders = {
  * Cisco in the U.S. and other countries and is used by Apple under license.
  * Scaleway is not affiliated with Apple Inc.
  */
-export class ApplesiliconV1Alpha1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = ['fr-par-3']
 
diff --git a/packages/clients/src/api/applesilicon/v1alpha1/index.gen.ts b/packages/clients/src/api/applesilicon/v1alpha1/index.gen.ts
new file mode 100644
index 000000000..8bdf6bf6a
--- /dev/null
+++ b/packages/clients/src/api/applesilicon/v1alpha1/index.gen.ts
@@ -0,0 +1,29 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CreateServerRequest,
+  DeleteServerRequest,
+  GetOSRequest,
+  GetServerRequest,
+  GetServerTypeRequest,
+  ListOSRequest,
+  ListOSResponse,
+  ListServerTypesRequest,
+  ListServerTypesResponse,
+  ListServersRequest,
+  ListServersRequestOrderBy,
+  ListServersResponse,
+  OS,
+  RebootServerRequest,
+  ReinstallServerRequest,
+  Server,
+  ServerStatus,
+  ServerType,
+  ServerTypeCPU,
+  ServerTypeDisk,
+  ServerTypeMemory,
+  ServerTypeStock,
+  UpdateServerRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/applesilicon/v1alpha1/index.ts b/packages/clients/src/api/applesilicon/v1alpha1/index.ts
deleted file mode 100644
index 2f9dee02d..000000000
--- a/packages/clients/src/api/applesilicon/v1alpha1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ApplesiliconV1Alpha1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/baremetal/v1/api.gen.ts b/packages/clients/src/api/baremetal/v1/api.gen.ts
index f4a94a190..ac0ec50b3 100644
--- a/packages/clients/src/api/baremetal/v1/api.gen.ts
+++ b/packages/clients/src/api/baremetal/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -97,7 +97,7 @@ const jsonContentHeaders = {
  *
  * This API allows to manage your Bare metal server.
  */
-export class BaremetalV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
@@ -732,7 +732,7 @@ export class BaremetalV1GenAPI extends API {
 }
 
 /** Elastic Metal Private Network API. */
-export class BaremetalPrivateNetworkV1GenAPI extends API {
+export class PrivateNetworkAPI extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = ['fr-par-2']
 
diff --git a/packages/clients/src/api/baremetal/v1/api.utils.ts b/packages/clients/src/api/baremetal/v1/api.utils.ts
index 566a8ea82..b80f507e3 100644
--- a/packages/clients/src/api/baremetal/v1/api.utils.ts
+++ b/packages/clients/src/api/baremetal/v1/api.utils.ts
@@ -3,11 +3,11 @@ import {
   tryAtIntervals,
 } from '../../../internal/async/interval-retrier'
 import type { WaitForOptions } from '../../../internal/async/interval-retrier'
-import { BaremetalV1GenAPI } from './api.gen'
+import { API } from './api.gen'
 import { SERVER_INSTALL_TRANSIENT_STATUSES } from './content.gen'
 import type { GetServerRequest, ServerInstall } from './types.gen'
 
-export class BaremetalV1UtilsAPI extends BaremetalV1GenAPI {
+export class BaremetalV1UtilsAPI extends API {
   /**
    * Waits for {@link ServerInstall} to be in a final state.
    *
diff --git a/packages/clients/src/api/baremetal/v1/index.gen.ts b/packages/clients/src/api/baremetal/v1/index.gen.ts
new file mode 100644
index 000000000..6c69500dd
--- /dev/null
+++ b/packages/clients/src/api/baremetal/v1/index.gen.ts
@@ -0,0 +1,80 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API, PrivateNetworkAPI } from './api.gen'
+export * from './content.gen'
+export type {
+  AddOptionServerRequest,
+  BMCAccess,
+  CPU,
+  CreateServerRequest,
+  CreateServerRequestInstall,
+  DeleteOptionServerRequest,
+  DeleteServerRequest,
+  Disk,
+  GetBMCAccessRequest,
+  GetOSRequest,
+  GetOfferRequest,
+  GetOptionRequest,
+  GetServerMetricsRequest,
+  GetServerMetricsResponse,
+  GetServerRequest,
+  IP,
+  IPReverseStatus,
+  IPVersion,
+  InstallServerRequest,
+  ListOSRequest,
+  ListOSResponse,
+  ListOffersRequest,
+  ListOffersResponse,
+  ListOptionsRequest,
+  ListOptionsResponse,
+  ListServerEventsRequest,
+  ListServerEventsRequestOrderBy,
+  ListServerEventsResponse,
+  ListServerPrivateNetworksRequestOrderBy,
+  ListServerPrivateNetworksResponse,
+  ListServersRequest,
+  ListServersRequestOrderBy,
+  ListServersResponse,
+  ListSettingsRequest,
+  ListSettingsRequestOrderBy,
+  ListSettingsResponse,
+  Memory,
+  OS,
+  OSOSField,
+  Offer,
+  OfferOptionOffer,
+  OfferStock,
+  OfferSubscriptionPeriod,
+  Option,
+  PersistentMemory,
+  PrivateNetworkApiAddServerPrivateNetworkRequest,
+  PrivateNetworkApiDeleteServerPrivateNetworkRequest,
+  PrivateNetworkApiListServerPrivateNetworksRequest,
+  PrivateNetworkApiSetServerPrivateNetworksRequest,
+  RaidController,
+  RebootServerRequest,
+  Server,
+  ServerBootType,
+  ServerEvent,
+  ServerInstall,
+  ServerInstallStatus,
+  ServerOption,
+  ServerOptionOptionStatus,
+  ServerPingStatus,
+  ServerPrivateNetwork,
+  ServerPrivateNetworkStatus,
+  ServerRescueServer,
+  ServerStatus,
+  SetServerPrivateNetworksResponse,
+  Setting,
+  SettingType,
+  StartBMCAccessRequest,
+  StartServerRequest,
+  StopBMCAccessRequest,
+  StopServerRequest,
+  UpdateIPRequest,
+  UpdateServerRequest,
+  UpdateSettingRequest,
+} from './types.gen'
+export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/baremetal/v1/index.ts b/packages/clients/src/api/baremetal/v1/index.ts
index c94b653a9..295d95dd1 100644
--- a/packages/clients/src/api/baremetal/v1/index.ts
+++ b/packages/clients/src/api/baremetal/v1/index.ts
@@ -1,5 +1,5 @@
 export { BaremetalV1UtilsAPI as API } from './api.utils'
-export { BaremetalPrivateNetworkV1GenAPI as PrivateNetworkAPI } from './api.gen'
+export { PrivateNetworkAPI } from './api.gen'
 export * from './content.gen'
 export * from './types.gen'
 export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/container/index.ts b/packages/clients/src/api/container/index.ts
index 3a6e98147..1984b471f 100644
--- a/packages/clients/src/api/container/index.ts
+++ b/packages/clients/src/api/container/index.ts
@@ -1 +1 @@
-export * as v1beta1 from './v1beta1'
+export * as v1beta1 from './v1beta1/index.gen'
diff --git a/packages/clients/src/api/container/v1beta1/api.gen.ts b/packages/clients/src/api/container/v1beta1/api.gen.ts
index 8e9914ae5..d617f4505 100644
--- a/packages/clients/src/api/container/v1beta1/api.gen.ts
+++ b/packages/clients/src/api/container/v1beta1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   resolveOneOf,
   urlParams,
@@ -86,7 +86,7 @@ const jsonContentHeaders = {
  *
  * Serverless Containers API.
  */
-export class ContainerV1Beta1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
diff --git a/packages/clients/src/api/container/v1beta1/index.gen.ts b/packages/clients/src/api/container/v1beta1/index.gen.ts
new file mode 100644
index 000000000..3651eb970
--- /dev/null
+++ b/packages/clients/src/api/container/v1beta1/index.gen.ts
@@ -0,0 +1,62 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  Container,
+  ContainerHttpOption,
+  ContainerPrivacy,
+  ContainerProtocol,
+  ContainerStatus,
+  CreateContainerRequest,
+  CreateCronRequest,
+  CreateDomainRequest,
+  CreateNamespaceRequest,
+  CreateTokenRequest,
+  Cron,
+  CronStatus,
+  DeleteContainerRequest,
+  DeleteCronRequest,
+  DeleteDomainRequest,
+  DeleteNamespaceRequest,
+  DeleteTokenRequest,
+  DeployContainerRequest,
+  Domain,
+  DomainStatus,
+  GetContainerRequest,
+  GetCronRequest,
+  GetDomainRequest,
+  GetNamespaceRequest,
+  GetTokenRequest,
+  IssueJWTRequest,
+  ListContainersRequest,
+  ListContainersRequestOrderBy,
+  ListContainersResponse,
+  ListCronsRequest,
+  ListCronsRequestOrderBy,
+  ListCronsResponse,
+  ListDomainsRequest,
+  ListDomainsRequestOrderBy,
+  ListDomainsResponse,
+  ListLogsRequest,
+  ListLogsRequestOrderBy,
+  ListLogsResponse,
+  ListNamespacesRequest,
+  ListNamespacesRequestOrderBy,
+  ListNamespacesResponse,
+  ListTokensRequest,
+  ListTokensRequestOrderBy,
+  ListTokensResponse,
+  Log,
+  LogStream,
+  Namespace,
+  NamespaceStatus,
+  NullValue,
+  Secret,
+  SecretHashedValue,
+  Token,
+  TokenStatus,
+  UpdateContainerRequest,
+  UpdateCronRequest,
+  UpdateNamespaceRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/container/v1beta1/index.ts b/packages/clients/src/api/container/v1beta1/index.ts
deleted file mode 100644
index 7c8e14926..000000000
--- a/packages/clients/src/api/container/v1beta1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ContainerV1Beta1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/domain/index.ts b/packages/clients/src/api/domain/index.ts
index b64125a26..2d745733e 100644
--- a/packages/clients/src/api/domain/index.ts
+++ b/packages/clients/src/api/domain/index.ts
@@ -1 +1 @@
-export * as v2beta1 from './v2beta1'
+export * as v2beta1 from './v2beta1/index.gen'
diff --git a/packages/clients/src/api/domain/v2beta1/api.gen.ts b/packages/clients/src/api/domain/v2beta1/api.gen.ts
index 563c58cd6..9dd8d4322 100644
--- a/packages/clients/src/api/domain/v2beta1/api.gen.ts
+++ b/packages/clients/src/api/domain/v2beta1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   unmarshalScwFile,
   urlParams,
@@ -164,7 +164,7 @@ const jsonContentHeaders = {
  *
  * Manage your DNS zones and records.
  */
-export class DomainV2Beta1GenAPI extends API {
+export class API extends ParentAPI {
   protected pageOfListDNSZones = (request: Readonly<ListDNSZonesRequest>) =>
     this.client.fetch<ListDNSZonesResponse>(
       {
@@ -773,7 +773,7 @@ export class DomainV2Beta1GenAPI extends API {
  *
  * Manage your domains and contacts.
  */
-export class DomainRegistrarV2Beta1GenAPI extends API {
+export class RegistrarAPI extends ParentAPI {
   protected pageOfListTasks = (
     request: Readonly<RegistrarApiListTasksRequest>,
   ) =>
diff --git a/packages/clients/src/api/domain/v2beta1/index.gen.ts b/packages/clients/src/api/domain/v2beta1/index.gen.ts
new file mode 100644
index 000000000..968c121eb
--- /dev/null
+++ b/packages/clients/src/api/domain/v2beta1/index.gen.ts
@@ -0,0 +1,160 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API, RegistrarAPI } from './api.gen'
+export * from './content.gen'
+export type {
+  AvailableDomain,
+  CheckContactsCompatibilityResponse,
+  CheckContactsCompatibilityResponseContactCheckResult,
+  ClearDNSZoneRecordsRequest,
+  ClearDNSZoneRecordsResponse,
+  CloneDNSZoneRequest,
+  Contact,
+  ContactEmailStatus,
+  ContactExtensionEU,
+  ContactExtensionFR,
+  ContactExtensionFRAssociationInfo,
+  ContactExtensionFRCodeAuthAfnicInfo,
+  ContactExtensionFRDunsInfo,
+  ContactExtensionFRIndividualInfo,
+  ContactExtensionFRMode,
+  ContactExtensionFRTrademarkInfo,
+  ContactExtensionNL,
+  ContactExtensionNLLegalForm,
+  ContactLegalForm,
+  ContactQuestion,
+  ContactRoles,
+  ContactRolesRoles,
+  CreateDNSZoneRequest,
+  CreateSSLCertificateRequest,
+  DNSZone,
+  DNSZoneStatus,
+  DNSZoneVersion,
+  DSRecord,
+  DSRecordAlgorithm,
+  DSRecordDigest,
+  DSRecordDigestType,
+  DSRecordPublicKey,
+  DeleteDNSZoneRequest,
+  DeleteDNSZoneResponse,
+  DeleteDNSZoneTsigKeyRequest,
+  DeleteExternalDomainResponse,
+  DeleteSSLCertificateRequest,
+  DeleteSSLCertificateResponse,
+  Domain,
+  DomainDNSSEC,
+  DomainFeatureStatus,
+  DomainRecord,
+  DomainRecordGeoIPConfig,
+  DomainRecordGeoIPConfigMatch,
+  DomainRecordHTTPServiceConfig,
+  DomainRecordHTTPServiceConfigStrategy,
+  DomainRecordType,
+  DomainRecordViewConfig,
+  DomainRecordViewConfigView,
+  DomainRecordWeightedConfig,
+  DomainRecordWeightedConfigWeightedIP,
+  DomainRegistrationStatusExternalDomain,
+  DomainRegistrationStatusTransfer,
+  DomainRegistrationStatusTransferStatus,
+  DomainStatus,
+  DomainSummary,
+  ExportRawDNSZoneRequest,
+  GetDNSZoneTsigKeyRequest,
+  GetDNSZoneTsigKeyResponse,
+  GetDNSZoneVersionDiffRequest,
+  GetDNSZoneVersionDiffResponse,
+  GetDomainAuthCodeResponse,
+  GetSSLCertificateRequest,
+  Host,
+  HostStatus,
+  ImportProviderDNSZoneRequest,
+  ImportProviderDNSZoneRequestOnlineV1,
+  ImportProviderDNSZoneResponse,
+  ImportRawDNSZoneRequest,
+  ImportRawDNSZoneRequestAXFRSource,
+  ImportRawDNSZoneRequestBindSource,
+  ImportRawDNSZoneRequestTsigKey,
+  ImportRawDNSZoneResponse,
+  LanguageCode,
+  ListContactsResponse,
+  ListDNSZoneNameserversRequest,
+  ListDNSZoneNameserversResponse,
+  ListDNSZoneRecordsRequest,
+  ListDNSZoneRecordsRequestOrderBy,
+  ListDNSZoneRecordsResponse,
+  ListDNSZoneVersionRecordsRequest,
+  ListDNSZoneVersionRecordsResponse,
+  ListDNSZoneVersionsRequest,
+  ListDNSZoneVersionsResponse,
+  ListDNSZonesRequest,
+  ListDNSZonesRequestOrderBy,
+  ListDNSZonesResponse,
+  ListDomainHostsResponse,
+  ListDomainsRequestOrderBy,
+  ListDomainsResponse,
+  ListRenewableDomainsRequestOrderBy,
+  ListRenewableDomainsResponse,
+  ListSSLCertificatesRequest,
+  ListSSLCertificatesResponse,
+  ListTasksResponse,
+  Nameserver,
+  NewContact,
+  OrderResponse,
+  RawFormat,
+  RecordChange,
+  RecordChangeAdd,
+  RecordChangeClear,
+  RecordChangeDelete,
+  RecordChangeSet,
+  RecordIdentifier,
+  RefreshDNSZoneRequest,
+  RefreshDNSZoneResponse,
+  RegisterExternalDomainResponse,
+  RegistrarApiBuyDomainsRequest,
+  RegistrarApiCheckContactsCompatibilityRequest,
+  RegistrarApiCreateDomainHostRequest,
+  RegistrarApiDeleteDomainHostRequest,
+  RegistrarApiDeleteExternalDomainRequest,
+  RegistrarApiDisableDomainAutoRenewRequest,
+  RegistrarApiDisableDomainDNSSECRequest,
+  RegistrarApiEnableDomainAutoRenewRequest,
+  RegistrarApiEnableDomainDNSSECRequest,
+  RegistrarApiGetContactRequest,
+  RegistrarApiGetDomainAuthCodeRequest,
+  RegistrarApiGetDomainRequest,
+  RegistrarApiListContactsRequest,
+  RegistrarApiListDomainHostsRequest,
+  RegistrarApiListDomainsRequest,
+  RegistrarApiListRenewableDomainsRequest,
+  RegistrarApiListTasksRequest,
+  RegistrarApiLockDomainTransferRequest,
+  RegistrarApiRegisterExternalDomainRequest,
+  RegistrarApiRenewDomainsRequest,
+  RegistrarApiSearchAvailableDomainsRequest,
+  RegistrarApiTradeDomainRequest,
+  RegistrarApiTransferInDomainRequest,
+  RegistrarApiUnlockDomainTransferRequest,
+  RegistrarApiUpdateContactRequest,
+  RegistrarApiUpdateDomainHostRequest,
+  RegistrarApiUpdateDomainRequest,
+  RenewableDomain,
+  RenewableDomainStatus,
+  RestoreDNSZoneVersionRequest,
+  RestoreDNSZoneVersionResponse,
+  SSLCertificate,
+  SSLCertificateStatus,
+  SearchAvailableDomainsResponse,
+  Task,
+  TaskStatus,
+  TaskType,
+  Tld,
+  TldOffer,
+  TransferInDomainRequestTransferRequest,
+  UpdateContactRequestQuestion,
+  UpdateDNSZoneNameserversRequest,
+  UpdateDNSZoneNameserversResponse,
+  UpdateDNSZoneRecordsRequest,
+  UpdateDNSZoneRecordsResponse,
+  UpdateDNSZoneRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/domain/v2beta1/index.ts b/packages/clients/src/api/domain/v2beta1/index.ts
deleted file mode 100644
index 633c942b5..000000000
--- a/packages/clients/src/api/domain/v2beta1/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export {
-  DomainV2Beta1GenAPI as API,
-  DomainRegistrarV2Beta1GenAPI as RegistrarAPI,
-} from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/flexibleip/index.ts b/packages/clients/src/api/flexibleip/index.ts
index e6671523d..e49bded05 100644
--- a/packages/clients/src/api/flexibleip/index.ts
+++ b/packages/clients/src/api/flexibleip/index.ts
@@ -1 +1 @@
-export * as v1alpha1 from './v1alpha1'
+export * as v1alpha1 from './v1alpha1/index.gen'
diff --git a/packages/clients/src/api/flexibleip/v1alpha1/api.gen.ts b/packages/clients/src/api/flexibleip/v1alpha1/api.gen.ts
index 9ca1ed334..fee43c79a 100644
--- a/packages/clients/src/api/flexibleip/v1alpha1/api.gen.ts
+++ b/packages/clients/src/api/flexibleip/v1alpha1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -45,7 +45,7 @@ const jsonContentHeaders = {
 }
 
 /** Flexible IP API. */
-export class FlexibleipV1Alpha1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/flexibleip/v1alpha1/index.gen.ts b/packages/clients/src/api/flexibleip/v1alpha1/index.gen.ts
new file mode 100644
index 000000000..7f6e02981
--- /dev/null
+++ b/packages/clients/src/api/flexibleip/v1alpha1/index.gen.ts
@@ -0,0 +1,27 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  AttachFlexibleIPRequest,
+  AttachFlexibleIPsResponse,
+  CreateFlexibleIPRequest,
+  DeleteFlexibleIPRequest,
+  DeleteMACAddrRequest,
+  DetachFlexibleIPRequest,
+  DetachFlexibleIPsResponse,
+  DuplicateMACAddrRequest,
+  FlexibleIP,
+  FlexibleIPStatus,
+  GenerateMACAddrRequest,
+  GetFlexibleIPRequest,
+  ListFlexibleIPsRequest,
+  ListFlexibleIPsRequestOrderBy,
+  ListFlexibleIPsResponse,
+  MACAddress,
+  MACAddressStatus,
+  MACAddressType,
+  MoveMACAddrRequest,
+  UpdateFlexibleIPRequest,
+} from './types.gen'
+export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/flexibleip/v1alpha1/index.ts b/packages/clients/src/api/flexibleip/v1alpha1/index.ts
deleted file mode 100644
index cc1d3c4d3..000000000
--- a/packages/clients/src/api/flexibleip/v1alpha1/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { FlexibleipV1Alpha1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
-export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/function/index.ts b/packages/clients/src/api/function/index.ts
index 3a6e98147..1984b471f 100644
--- a/packages/clients/src/api/function/index.ts
+++ b/packages/clients/src/api/function/index.ts
@@ -1 +1 @@
-export * as v1beta1 from './v1beta1'
+export * as v1beta1 from './v1beta1/index.gen'
diff --git a/packages/clients/src/api/function/v1beta1/api.gen.ts b/packages/clients/src/api/function/v1beta1/api.gen.ts
index d95f9cd4b..2266c6ff6 100644
--- a/packages/clients/src/api/function/v1beta1/api.gen.ts
+++ b/packages/clients/src/api/function/v1beta1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   resolveOneOf,
   urlParams,
@@ -123,7 +123,7 @@ const jsonContentHeaders = {
  *
  * Serverless functions API.
  */
-export class FunctionV1Beta1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
diff --git a/packages/clients/src/api/function/v1beta1/index.gen.ts b/packages/clients/src/api/function/v1beta1/index.gen.ts
new file mode 100644
index 000000000..c4e355862
--- /dev/null
+++ b/packages/clients/src/api/function/v1beta1/index.gen.ts
@@ -0,0 +1,109 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CreateCronRequest,
+  CreateDomainRequest,
+  CreateFunctionRequest,
+  CreateNamespaceRequest,
+  CreateTokenRequest,
+  CreateTriggerInputRequest,
+  CreateTriggerInputRequestNatsClientConfigSpec,
+  CreateTriggerInputRequestSqsClientConfigSpec,
+  CreateTriggerRequest,
+  CreateTriggerRequestNatsFailureHandlingPolicy,
+  CreateTriggerRequestNatsFailureHandlingPolicyNatsDeadLetter,
+  CreateTriggerRequestNatsFailureHandlingPolicyRetryPolicy,
+  CreateTriggerRequestNatsFailureHandlingPolicySqsDeadLetter,
+  CreateTriggerRequestSqsFailureHandlingPolicy,
+  Cron,
+  CronStatus,
+  DeleteCronRequest,
+  DeleteDomainRequest,
+  DeleteFunctionRequest,
+  DeleteNamespaceRequest,
+  DeleteTokenRequest,
+  DeleteTriggerInputRequest,
+  DeleteTriggerRequest,
+  DeployFunctionRequest,
+  Domain,
+  DomainStatus,
+  DownloadURL,
+  Function,
+  FunctionHttpOption,
+  FunctionPrivacy,
+  FunctionRuntime,
+  FunctionStatus,
+  GetCronRequest,
+  GetDomainRequest,
+  GetFunctionDownloadURLRequest,
+  GetFunctionRequest,
+  GetFunctionUploadURLRequest,
+  GetNamespaceRequest,
+  GetTokenRequest,
+  GetTriggerInputRequest,
+  GetTriggerRequest,
+  IssueJWTRequest,
+  ListCronsRequest,
+  ListCronsRequestOrderBy,
+  ListCronsResponse,
+  ListDomainsRequest,
+  ListDomainsRequestOrderBy,
+  ListDomainsResponse,
+  ListFunctionRuntimesRequest,
+  ListFunctionRuntimesResponse,
+  ListFunctionsRequest,
+  ListFunctionsRequestOrderBy,
+  ListFunctionsResponse,
+  ListLogsRequest,
+  ListLogsRequestOrderBy,
+  ListLogsResponse,
+  ListNamespacesRequest,
+  ListNamespacesRequestOrderBy,
+  ListNamespacesResponse,
+  ListTokensRequest,
+  ListTokensRequestOrderBy,
+  ListTokensResponse,
+  ListTriggerInputsRequest,
+  ListTriggerInputsRequestOrderBy,
+  ListTriggerInputsResponse,
+  ListTriggersRequest,
+  ListTriggersRequestOrderBy,
+  ListTriggersResponse,
+  Log,
+  LogStream,
+  Namespace,
+  NamespaceStatus,
+  NullValue,
+  Runtime,
+  RuntimeStatus,
+  Secret,
+  SecretHashedValue,
+  SetTriggerInputsRequest,
+  SetTriggerInputsRequestNatsConfigs,
+  SetTriggerInputsRequestSqsConfigs,
+  SetTriggerInputsResponse,
+  Token,
+  TokenStatus,
+  Trigger,
+  TriggerInput,
+  TriggerInputNatsClientConfig,
+  TriggerInputSqsClientConfig,
+  TriggerInputStatus,
+  TriggerNatsDeadLetter,
+  TriggerNatsFailureHandlingPolicy,
+  TriggerRetryPolicy,
+  TriggerSqsDeadLetter,
+  TriggerSqsFailureHandlingPolicy,
+  TriggerStatus,
+  TriggerType,
+  UpdateCronRequest,
+  UpdateFunctionRequest,
+  UpdateNamespaceRequest,
+  UpdateTriggerInputRequest,
+  UpdateTriggerInputRequestNatsClientConfigSpec,
+  UpdateTriggerInputRequestSqsClientConfigSpec,
+  UpdateTriggerRequest,
+  UploadURL,
+} from './types.gen'
diff --git a/packages/clients/src/api/function/v1beta1/index.ts b/packages/clients/src/api/function/v1beta1/index.ts
deleted file mode 100644
index 256ce611c..000000000
--- a/packages/clients/src/api/function/v1beta1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { FunctionV1Beta1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/iam/index.ts b/packages/clients/src/api/iam/index.ts
index e6671523d..e49bded05 100644
--- a/packages/clients/src/api/iam/index.ts
+++ b/packages/clients/src/api/iam/index.ts
@@ -1 +1 @@
-export * as v1alpha1 from './v1alpha1'
+export * as v1alpha1 from './v1alpha1/index.gen'
diff --git a/packages/clients/src/api/iam/v1alpha1/api.gen.ts b/packages/clients/src/api/iam/v1alpha1/api.gen.ts
index d7eac1ecf..7f6c15f6a 100644
--- a/packages/clients/src/api/iam/v1alpha1/api.gen.ts
+++ b/packages/clients/src/api/iam/v1alpha1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   resolveOneOf,
   urlParams,
@@ -96,7 +96,7 @@ const jsonContentHeaders = {
 }
 
 /** IAM API. */
-export class IamV1Alpha1GenAPI extends API {
+export class API extends ParentAPI {
   protected pageOfListSSHKeys = (request: Readonly<ListSSHKeysRequest> = {}) =>
     this.client.fetch<ListSSHKeysResponse>(
       {
diff --git a/packages/clients/src/api/iam/v1alpha1/index.gen.ts b/packages/clients/src/api/iam/v1alpha1/index.gen.ts
new file mode 100644
index 000000000..9fef22ead
--- /dev/null
+++ b/packages/clients/src/api/iam/v1alpha1/index.gen.ts
@@ -0,0 +1,69 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  APIKey,
+  AddGroupMemberRequest,
+  Application,
+  ClonePolicyRequest,
+  CreateAPIKeyRequest,
+  CreateApplicationRequest,
+  CreateGroupRequest,
+  CreatePolicyRequest,
+  CreateSSHKeyRequest,
+  DeleteAPIKeyRequest,
+  DeleteApplicationRequest,
+  DeleteGroupRequest,
+  DeletePolicyRequest,
+  DeleteSSHKeyRequest,
+  DeleteUserRequest,
+  GetAPIKeyRequest,
+  GetApplicationRequest,
+  GetGroupRequest,
+  GetPolicyRequest,
+  GetSSHKeyRequest,
+  GetUserRequest,
+  Group,
+  ListAPIKeysRequest,
+  ListAPIKeysRequestOrderBy,
+  ListAPIKeysResponse,
+  ListApplicationsRequest,
+  ListApplicationsRequestOrderBy,
+  ListApplicationsResponse,
+  ListGroupsRequest,
+  ListGroupsRequestOrderBy,
+  ListGroupsResponse,
+  ListPermissionSetsRequest,
+  ListPermissionSetsRequestOrderBy,
+  ListPermissionSetsResponse,
+  ListPoliciesRequest,
+  ListPoliciesRequestOrderBy,
+  ListPoliciesResponse,
+  ListRulesRequest,
+  ListRulesResponse,
+  ListSSHKeysRequest,
+  ListSSHKeysRequestOrderBy,
+  ListSSHKeysResponse,
+  ListUsersRequest,
+  ListUsersRequestOrderBy,
+  ListUsersResponse,
+  PermissionSet,
+  PermissionSetScopeType,
+  Policy,
+  RemoveGroupMemberRequest,
+  Rule,
+  RuleSpecs,
+  SSHKey,
+  SetGroupMembersRequest,
+  SetRulesRequest,
+  SetRulesResponse,
+  UpdateAPIKeyRequest,
+  UpdateApplicationRequest,
+  UpdateGroupRequest,
+  UpdatePolicyRequest,
+  UpdateSSHKeyRequest,
+  User,
+  UserStatus,
+  UserType,
+} from './types.gen'
+export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/iam/v1alpha1/index.ts b/packages/clients/src/api/iam/v1alpha1/index.ts
deleted file mode 100644
index 355f35b06..000000000
--- a/packages/clients/src/api/iam/v1alpha1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { IamV1Alpha1GenAPI as API } from './api.gen'
-export * from './types.gen'
-export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/instance/v1/api.gen.ts b/packages/clients/src/api/instance/v1/api.gen.ts
index 7ee4bd39c..ea0685b6b 100644
--- a/packages/clients/src/api/instance/v1/api.gen.ts
+++ b/packages/clients/src/api/instance/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -207,7 +207,7 @@ const jsonContentHeaders = {
 }
 
 /** Instance API. */
-export class InstanceV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/instance/v1/api.utils.ts b/packages/clients/src/api/instance/v1/api.utils.ts
index a5075c817..5f96f543d 100644
--- a/packages/clients/src/api/instance/v1/api.utils.ts
+++ b/packages/clients/src/api/instance/v1/api.utils.ts
@@ -3,7 +3,7 @@ import {
   tryAtIntervals,
 } from '../../../internal/async/interval-retrier'
 import type { WaitForOptions } from '../../../internal/async/interval-retrier'
-import { InstanceV1GenAPI } from './api.gen'
+import { API } from './api.gen'
 import {
   IMAGE_TRANSIENT_STATUSES,
   PRIVATE_NIC_TRANSIENT_STATUSES,
@@ -48,7 +48,7 @@ const validateNotUndefined = <T>(obj: T | undefined): T => {
   return obj
 }
 
-export class InstanceV1UtilsAPI extends InstanceV1GenAPI {
+export class InstanceV1UtilsAPI extends API {
   /**
    * Waits for {@link Image} to be in a final state.
    *
diff --git a/packages/clients/src/api/instance/v1/index.gen.ts b/packages/clients/src/api/instance/v1/index.gen.ts
new file mode 100644
index 000000000..ab43e3e83
--- /dev/null
+++ b/packages/clients/src/api/instance/v1/index.gen.ts
@@ -0,0 +1,166 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  Arch,
+  BootType,
+  Bootscript,
+  CreateImageRequest,
+  CreateImageResponse,
+  CreateIpRequest,
+  CreateIpResponse,
+  CreatePlacementGroupRequest,
+  CreatePlacementGroupResponse,
+  CreatePrivateNICRequest,
+  CreatePrivateNICResponse,
+  CreateSecurityGroupRequest,
+  CreateSecurityGroupResponse,
+  CreateSecurityGroupRuleRequest,
+  CreateSecurityGroupRuleResponse,
+  CreateServerResponse,
+  CreateSnapshotRequest,
+  CreateSnapshotResponse,
+  CreateVolumeRequest,
+  CreateVolumeResponse,
+  Dashboard,
+  DeleteImageRequest,
+  DeleteIpRequest,
+  DeletePlacementGroupRequest,
+  DeletePrivateNICRequest,
+  DeleteSecurityGroupRequest,
+  DeleteSecurityGroupRuleRequest,
+  DeleteServerRequest,
+  DeleteServerUserDataRequest,
+  DeleteSnapshotRequest,
+  DeleteVolumeRequest,
+  ExportSnapshotRequest,
+  ExportSnapshotResponse,
+  GetBootscriptRequest,
+  GetBootscriptResponse,
+  GetDashboardRequest,
+  GetDashboardResponse,
+  GetImageRequest,
+  GetImageResponse,
+  GetIpRequest,
+  GetIpResponse,
+  GetPlacementGroupRequest,
+  GetPlacementGroupResponse,
+  GetPlacementGroupServersRequest,
+  GetPlacementGroupServersResponse,
+  GetPrivateNICRequest,
+  GetPrivateNICResponse,
+  GetSecurityGroupRequest,
+  GetSecurityGroupResponse,
+  GetSecurityGroupRuleRequest,
+  GetSecurityGroupRuleResponse,
+  GetServerRequest,
+  GetServerResponse,
+  GetServerTypesAvailabilityRequest,
+  GetServerTypesAvailabilityResponse,
+  GetServerTypesAvailabilityResponseAvailability,
+  GetSnapshotRequest,
+  GetSnapshotResponse,
+  GetVolumeRequest,
+  GetVolumeResponse,
+  Image,
+  ImageState,
+  Ip,
+  ListBootscriptsRequest,
+  ListBootscriptsResponse,
+  ListDefaultSecurityGroupRulesRequest,
+  ListImagesRequest,
+  ListImagesResponse,
+  ListIpsRequest,
+  ListIpsResponse,
+  ListPlacementGroupsRequest,
+  ListPlacementGroupsResponse,
+  ListPrivateNICsRequest,
+  ListPrivateNICsResponse,
+  ListSecurityGroupRulesRequest,
+  ListSecurityGroupRulesResponse,
+  ListSecurityGroupsRequest,
+  ListSecurityGroupsResponse,
+  ListServerActionsRequest,
+  ListServerActionsResponse,
+  ListServerUserDataRequest,
+  ListServerUserDataResponse,
+  ListServersRequest,
+  ListServersRequestOrder,
+  ListServersResponse,
+  ListServersTypesRequest,
+  ListServersTypesResponse,
+  ListSnapshotsRequest,
+  ListSnapshotsResponse,
+  ListVolumesRequest,
+  ListVolumesResponse,
+  ListVolumesTypesRequest,
+  ListVolumesTypesResponse,
+  PlacementGroup,
+  PlacementGroupPolicyMode,
+  PlacementGroupPolicyType,
+  PlacementGroupServer,
+  PrivateNIC,
+  PrivateNICState,
+  SecurityGroup,
+  SecurityGroupPolicy,
+  SecurityGroupRule,
+  SecurityGroupRuleAction,
+  SecurityGroupRuleDirection,
+  SecurityGroupRuleProtocol,
+  SecurityGroupState,
+  SecurityGroupSummary,
+  SecurityGroupTemplate,
+  Server,
+  ServerAction,
+  ServerActionRequest,
+  ServerActionRequestVolumeBackupTemplate,
+  ServerActionResponse,
+  ServerIp,
+  ServerIpv6,
+  ServerLocation,
+  ServerMaintenance,
+  ServerState,
+  ServerSummary,
+  ServerType,
+  ServerTypeCapabilities,
+  ServerTypeNetwork,
+  ServerTypeNetworkInterface,
+  ServerTypeVolumeConstraintSizes,
+  ServerTypeVolumeConstraintsByType,
+  ServerTypesAvailability,
+  SetPlacementGroupRequest,
+  SetPlacementGroupResponse,
+  SetPlacementGroupServersRequest,
+  SetPlacementGroupServersResponse,
+  SetSecurityGroupRulesRequest,
+  SetSecurityGroupRulesRequestRule,
+  SetSecurityGroupRulesResponse,
+  Snapshot,
+  SnapshotBaseVolume,
+  SnapshotState,
+  SnapshotVolumeType,
+  Task,
+  TaskStatus,
+  UpdateIpRequest,
+  UpdateIpResponse,
+  UpdatePlacementGroupRequest,
+  UpdatePlacementGroupResponse,
+  UpdatePlacementGroupServersRequest,
+  UpdatePlacementGroupServersResponse,
+  UpdateServerResponse,
+  UpdateVolumeRequest,
+  UpdateVolumeResponse,
+  Volume,
+  VolumeServer,
+  VolumeServerState,
+  VolumeServerTemplate,
+  VolumeServerVolumeType,
+  VolumeState,
+  VolumeSummary,
+  VolumeTemplate,
+  VolumeType,
+  VolumeTypeCapabilities,
+  VolumeTypeConstraints,
+  VolumeVolumeType,
+} from './types.gen'
diff --git a/packages/clients/src/api/iot/index.ts b/packages/clients/src/api/iot/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/iot/index.ts
+++ b/packages/clients/src/api/iot/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/iot/v1/api.gen.ts b/packages/clients/src/api/iot/v1/api.gen.ts
index 880026977..9096e5556 100644
--- a/packages/clients/src/api/iot/v1/api.gen.ts
+++ b/packages/clients/src/api/iot/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -106,7 +106,7 @@ const jsonContentHeaders = {
  *
  * This API allows you to manage IoT hubs and devices.
  */
-export class IotV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par']
 
diff --git a/packages/clients/src/api/iot/v1/index.gen.ts b/packages/clients/src/api/iot/v1/index.gen.ts
new file mode 100644
index 000000000..f441e2610
--- /dev/null
+++ b/packages/clients/src/api/iot/v1/index.gen.ts
@@ -0,0 +1,89 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  Certificate,
+  CreateDeviceRequest,
+  CreateDeviceResponse,
+  CreateHubRequest,
+  CreateNetworkRequest,
+  CreateNetworkResponse,
+  CreateRouteRequest,
+  CreateRouteRequestDatabaseConfig,
+  CreateRouteRequestRestConfig,
+  CreateRouteRequestS3Config,
+  DeleteDeviceRequest,
+  DeleteHubRequest,
+  DeleteNetworkRequest,
+  DeleteRouteRequest,
+  DeleteTwinDocumentRequest,
+  DeleteTwinDocumentsRequest,
+  Device,
+  DeviceMessageFilters,
+  DeviceMessageFiltersRule,
+  DeviceMessageFiltersRulePolicy,
+  DeviceStatus,
+  DisableDeviceRequest,
+  DisableHubRequest,
+  EnableDeviceRequest,
+  EnableHubRequest,
+  GetDeviceCertificateRequest,
+  GetDeviceCertificateResponse,
+  GetDeviceMetricsRequest,
+  GetDeviceMetricsResponse,
+  GetDeviceRequest,
+  GetHubCARequest,
+  GetHubCAResponse,
+  GetHubMetricsRequest,
+  GetHubMetricsResponse,
+  GetHubRequest,
+  GetNetworkRequest,
+  GetRouteRequest,
+  GetTwinDocumentRequest,
+  Hub,
+  HubProductPlan,
+  HubStatus,
+  HubTwinsGraphiteConfig,
+  ListDevicesRequest,
+  ListDevicesRequestOrderBy,
+  ListDevicesResponse,
+  ListHubsRequest,
+  ListHubsRequestOrderBy,
+  ListHubsResponse,
+  ListNetworksRequest,
+  ListNetworksRequestOrderBy,
+  ListNetworksResponse,
+  ListRoutesRequest,
+  ListRoutesRequestOrderBy,
+  ListRoutesResponse,
+  ListTwinDocumentsRequest,
+  ListTwinDocumentsResponse,
+  ListTwinDocumentsResponseDocumentSummary,
+  Network,
+  NetworkNetworkType,
+  NullValue,
+  PatchTwinDocumentRequest,
+  PutTwinDocumentRequest,
+  RenewDeviceCertificateRequest,
+  RenewDeviceCertificateResponse,
+  Route,
+  RouteDatabaseConfig,
+  RouteDatabaseConfigEngine,
+  RouteRestConfig,
+  RouteRestConfigHttpVerb,
+  RouteRouteType,
+  RouteS3Config,
+  RouteS3ConfigS3Strategy,
+  RouteSummary,
+  SetDeviceCertificateRequest,
+  SetDeviceCertificateResponse,
+  SetHubCARequest,
+  TwinDocument,
+  UpdateDeviceRequest,
+  UpdateHubRequest,
+  UpdateRouteRequest,
+  UpdateRouteRequestDatabaseConfig,
+  UpdateRouteRequestRestConfig,
+  UpdateRouteRequestS3Config,
+} from './types.gen'
diff --git a/packages/clients/src/api/iot/v1/index.ts b/packages/clients/src/api/iot/v1/index.ts
deleted file mode 100644
index a8b7ce981..000000000
--- a/packages/clients/src/api/iot/v1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { IotV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/k8s/index.ts b/packages/clients/src/api/k8s/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/k8s/index.ts
+++ b/packages/clients/src/api/k8s/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/k8s/v1/api.gen.ts b/packages/clients/src/api/k8s/v1/api.gen.ts
index f8b59df73..4ea314395 100644
--- a/packages/clients/src/api/k8s/v1/api.gen.ts
+++ b/packages/clients/src/api/k8s/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   unmarshalScwFile,
   urlParams,
@@ -70,7 +70,7 @@ const jsonContentHeaders = {
 }
 
 /** Kapsule API. */
-export class K8SV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
diff --git a/packages/clients/src/api/k8s/v1/index.gen.ts b/packages/clients/src/api/k8s/v1/index.gen.ts
new file mode 100644
index 000000000..9b4c954a4
--- /dev/null
+++ b/packages/clients/src/api/k8s/v1/index.gen.ts
@@ -0,0 +1,65 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  AutoscalerEstimator,
+  AutoscalerExpander,
+  CNI,
+  Cluster,
+  ClusterAutoUpgrade,
+  ClusterAutoscalerConfig,
+  ClusterOpenIDConnectConfig,
+  ClusterStatus,
+  CreateClusterRequest,
+  CreateClusterRequestAutoUpgrade,
+  CreateClusterRequestAutoscalerConfig,
+  CreateClusterRequestOpenIDConnectConfig,
+  CreateClusterRequestPoolConfig,
+  CreateClusterRequestPoolConfigUpgradePolicy,
+  CreatePoolRequest,
+  CreatePoolRequestUpgradePolicy,
+  DeleteClusterRequest,
+  DeleteNodeRequest,
+  DeletePoolRequest,
+  GetClusterRequest,
+  GetNodeRequest,
+  GetPoolRequest,
+  GetVersionRequest,
+  Ingress,
+  ListClusterAvailableVersionsRequest,
+  ListClusterAvailableVersionsResponse,
+  ListClustersRequest,
+  ListClustersRequestOrderBy,
+  ListClustersResponse,
+  ListNodesRequest,
+  ListNodesRequestOrderBy,
+  ListNodesResponse,
+  ListPoolsRequest,
+  ListPoolsRequestOrderBy,
+  ListPoolsResponse,
+  ListVersionsRequest,
+  ListVersionsResponse,
+  MaintenanceWindow,
+  MaintenanceWindowDayOfTheWeek,
+  Node,
+  NodeStatus,
+  Pool,
+  PoolStatus,
+  PoolUpgradePolicy,
+  PoolVolumeType,
+  RebootNodeRequest,
+  ReplaceNodeRequest,
+  ResetClusterAdminTokenRequest,
+  Runtime,
+  UpdateClusterRequest,
+  UpdateClusterRequestAutoUpgrade,
+  UpdateClusterRequestAutoscalerConfig,
+  UpdateClusterRequestOpenIDConnectConfig,
+  UpdatePoolRequest,
+  UpdatePoolRequestUpgradePolicy,
+  UpgradeClusterRequest,
+  UpgradePoolRequest,
+  Version,
+} from './types.gen'
+export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/k8s/v1/index.ts b/packages/clients/src/api/k8s/v1/index.ts
deleted file mode 100644
index 321063328..000000000
--- a/packages/clients/src/api/k8s/v1/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { K8SV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
-export * as ValidationRules from './validation-rules.gen'
diff --git a/packages/clients/src/api/lb/v1/api.gen.ts b/packages/clients/src/api/lb/v1/api.gen.ts
index 3b5620e33..6bff0a31d 100644
--- a/packages/clients/src/api/lb/v1/api.gen.ts
+++ b/packages/clients/src/api/lb/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -226,7 +226,7 @@ const jsonContentHeaders = {
  *
  * This API allows you to manage your load balancer service.
  */
-export class LbV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
@@ -1501,7 +1501,7 @@ export class LbV1GenAPI extends API {
  *
  * This API allows you to manage your load balancer service.
  */
-export class LbZonedV1GenAPI extends API {
+export class ZonedAPI extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/lb/v1/api.utils.ts b/packages/clients/src/api/lb/v1/api.utils.ts
index c998c89d1..b56851c28 100644
--- a/packages/clients/src/api/lb/v1/api.utils.ts
+++ b/packages/clients/src/api/lb/v1/api.utils.ts
@@ -3,7 +3,7 @@ import {
   tryAtIntervals,
 } from '../../../internal/async/interval-retrier'
 import type { WaitForOptions } from '../../../internal/async/interval-retrier'
-import { LbV1GenAPI, LbZonedV1GenAPI } from './api.gen'
+import { API, ZonedAPI } from './api.gen'
 import {
   INSTANCE_TRANSIENT_STATUSES,
   LB_TRANSIENT_STATUSES,
@@ -20,7 +20,7 @@ import type {
   ZonedWaitForLbPrivateNetworksRequest,
 } from './types.utils'
 
-export class LbV1UtilsAPI extends LbV1GenAPI {
+export class LbV1UtilsAPI extends API {
   /**
    * Waits for all private networks of a load balancer to be in a final state.
    *
@@ -92,7 +92,7 @@ export class LbV1UtilsAPI extends LbV1GenAPI {
     )
 }
 
-export class LbZonedV1UtilsAPI extends LbZonedV1GenAPI {
+export class LbZonedV1UtilsAPI extends ZonedAPI {
   /**
    * Waits for all private networks of a (zoned) load balancer to be in a final
    * state.
diff --git a/packages/clients/src/api/lb/v1/index.gen.ts b/packages/clients/src/api/lb/v1/index.gen.ts
new file mode 100644
index 000000000..ed561bc55
--- /dev/null
+++ b/packages/clients/src/api/lb/v1/index.gen.ts
@@ -0,0 +1,180 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API, ZonedAPI } from './api.gen'
+export * from './content.gen'
+export type {
+  Acl,
+  AclAction,
+  AclActionType,
+  AclHttpFilter,
+  AclMatch,
+  AclSpec,
+  AddBackendServersRequest,
+  AttachPrivateNetworkRequest,
+  Backend,
+  BackendServerStats,
+  BackendServerStatsHealthCheckStatus,
+  BackendServerStatsServerState,
+  Certificate,
+  CertificateStatus,
+  CertificateType,
+  CreateAclRequest,
+  CreateBackendRequest,
+  CreateCertificateRequest,
+  CreateCertificateRequestCustomCertificate,
+  CreateCertificateRequestLetsencryptConfig,
+  CreateFrontendRequest,
+  CreateIpRequest,
+  CreateLbRequest,
+  CreateRouteRequest,
+  CreateSubscriberRequest,
+  DeleteAclRequest,
+  DeleteBackendRequest,
+  DeleteCertificateRequest,
+  DeleteFrontendRequest,
+  DeleteLbRequest,
+  DeleteRouteRequest,
+  DeleteSubscriberRequest,
+  DetachPrivateNetworkRequest,
+  ForwardPortAlgorithm,
+  Frontend,
+  GetAclRequest,
+  GetBackendRequest,
+  GetCertificateRequest,
+  GetFrontendRequest,
+  GetIpRequest,
+  GetLbRequest,
+  GetLbStatsRequest,
+  GetRouteRequest,
+  GetSubscriberRequest,
+  HealthCheck,
+  HealthCheckHttpConfig,
+  HealthCheckHttpsConfig,
+  HealthCheckLdapConfig,
+  HealthCheckMysqlConfig,
+  HealthCheckPgsqlConfig,
+  HealthCheckRedisConfig,
+  HealthCheckTcpConfig,
+  Instance,
+  InstanceStatus,
+  Ip,
+  Lb,
+  LbStats,
+  LbStatus,
+  LbType,
+  LbTypeStock,
+  ListAclRequestOrderBy,
+  ListAclResponse,
+  ListAclsRequest,
+  ListBackendStatsRequest,
+  ListBackendStatsResponse,
+  ListBackendsRequest,
+  ListBackendsRequestOrderBy,
+  ListBackendsResponse,
+  ListCertificatesRequest,
+  ListCertificatesRequestOrderBy,
+  ListCertificatesResponse,
+  ListFrontendsRequest,
+  ListFrontendsRequestOrderBy,
+  ListFrontendsResponse,
+  ListIPsRequest,
+  ListIpsResponse,
+  ListLbPrivateNetworksRequest,
+  ListLbPrivateNetworksResponse,
+  ListLbTypesRequest,
+  ListLbTypesResponse,
+  ListLbsRequest,
+  ListLbsRequestOrderBy,
+  ListLbsResponse,
+  ListPrivateNetworksRequestOrderBy,
+  ListRoutesRequest,
+  ListRoutesRequestOrderBy,
+  ListRoutesResponse,
+  ListSubscriberRequest,
+  ListSubscriberRequestOrderBy,
+  ListSubscriberResponse,
+  MigrateLbRequest,
+  OnMarkedDownAction,
+  PrivateNetwork,
+  PrivateNetworkDHCPConfig,
+  PrivateNetworkStaticConfig,
+  PrivateNetworkStatus,
+  Protocol,
+  ProxyProtocol,
+  ReleaseIpRequest,
+  RemoveBackendServersRequest,
+  Route,
+  RouteMatch,
+  SSLCompatibilityLevel,
+  SetAclsResponse,
+  SetBackendServersRequest,
+  StickySessionsType,
+  SubscribeToLbRequest,
+  Subscriber,
+  SubscriberEmailConfig,
+  SubscriberWebhookConfig,
+  UnsubscribeFromLbRequest,
+  UpdateAclRequest,
+  UpdateBackendRequest,
+  UpdateCertificateRequest,
+  UpdateFrontendRequest,
+  UpdateHealthCheckRequest,
+  UpdateIpRequest,
+  UpdateLbRequest,
+  UpdateRouteRequest,
+  UpdateSubscriberRequest,
+  ZonedApiAddBackendServersRequest,
+  ZonedApiAttachPrivateNetworkRequest,
+  ZonedApiCreateAclRequest,
+  ZonedApiCreateBackendRequest,
+  ZonedApiCreateCertificateRequest,
+  ZonedApiCreateFrontendRequest,
+  ZonedApiCreateIpRequest,
+  ZonedApiCreateLbRequest,
+  ZonedApiCreateRouteRequest,
+  ZonedApiCreateSubscriberRequest,
+  ZonedApiDeleteAclRequest,
+  ZonedApiDeleteBackendRequest,
+  ZonedApiDeleteCertificateRequest,
+  ZonedApiDeleteFrontendRequest,
+  ZonedApiDeleteLbRequest,
+  ZonedApiDeleteRouteRequest,
+  ZonedApiDeleteSubscriberRequest,
+  ZonedApiDetachPrivateNetworkRequest,
+  ZonedApiGetAclRequest,
+  ZonedApiGetBackendRequest,
+  ZonedApiGetCertificateRequest,
+  ZonedApiGetFrontendRequest,
+  ZonedApiGetIpRequest,
+  ZonedApiGetLbRequest,
+  ZonedApiGetLbStatsRequest,
+  ZonedApiGetRouteRequest,
+  ZonedApiGetSubscriberRequest,
+  ZonedApiListAclsRequest,
+  ZonedApiListBackendStatsRequest,
+  ZonedApiListBackendsRequest,
+  ZonedApiListCertificatesRequest,
+  ZonedApiListFrontendsRequest,
+  ZonedApiListIPsRequest,
+  ZonedApiListLbPrivateNetworksRequest,
+  ZonedApiListLbTypesRequest,
+  ZonedApiListLbsRequest,
+  ZonedApiListRoutesRequest,
+  ZonedApiListSubscriberRequest,
+  ZonedApiMigrateLbRequest,
+  ZonedApiReleaseIpRequest,
+  ZonedApiRemoveBackendServersRequest,
+  ZonedApiSetAclsRequest,
+  ZonedApiSetBackendServersRequest,
+  ZonedApiSubscribeToLbRequest,
+  ZonedApiUnsubscribeFromLbRequest,
+  ZonedApiUpdateAclRequest,
+  ZonedApiUpdateBackendRequest,
+  ZonedApiUpdateCertificateRequest,
+  ZonedApiUpdateFrontendRequest,
+  ZonedApiUpdateHealthCheckRequest,
+  ZonedApiUpdateIpRequest,
+  ZonedApiUpdateLbRequest,
+  ZonedApiUpdateRouteRequest,
+  ZonedApiUpdateSubscriberRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/marketplace/index.ts b/packages/clients/src/api/marketplace/index.ts
index fa99cd69c..cd5521c9c 100644
--- a/packages/clients/src/api/marketplace/index.ts
+++ b/packages/clients/src/api/marketplace/index.ts
@@ -1,2 +1,2 @@
-export * as v1 from './v1'
-export * as v2 from './v2'
+export * as v1 from './v1/index.gen'
+export * as v2 from './v2/index.gen'
diff --git a/packages/clients/src/api/marketplace/v1/api.gen.ts b/packages/clients/src/api/marketplace/v1/api.gen.ts
index ed99d617e..30593be22 100644
--- a/packages/clients/src/api/marketplace/v1/api.gen.ts
+++ b/packages/clients/src/api/marketplace/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -24,7 +24,7 @@ import type {
 } from './types.gen'
 
 /** Marketplace API. */
-export class MarketplaceV1GenAPI extends API {
+export class API extends ParentAPI {
   protected pageOfListImages = (request: Readonly<ListImagesRequest> = {}) =>
     this.client.fetch<ListImagesResponse>(
       {
diff --git a/packages/clients/src/api/marketplace/v1/index.gen.ts b/packages/clients/src/api/marketplace/v1/index.gen.ts
new file mode 100644
index 000000000..437335fb1
--- /dev/null
+++ b/packages/clients/src/api/marketplace/v1/index.gen.ts
@@ -0,0 +1,17 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  GetImageRequest,
+  GetImageResponse,
+  GetVersionRequest,
+  GetVersionResponse,
+  Image,
+  ListImagesRequest,
+  ListImagesResponse,
+  ListVersionsRequest,
+  ListVersionsResponse,
+  LocalImage,
+  Organization,
+  Version,
+} from './types.gen'
diff --git a/packages/clients/src/api/marketplace/v1/index.ts b/packages/clients/src/api/marketplace/v1/index.ts
deleted file mode 100644
index a599319de..000000000
--- a/packages/clients/src/api/marketplace/v1/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { MarketplaceV1GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/marketplace/v2/api.gen.ts b/packages/clients/src/api/marketplace/v2/api.gen.ts
index 0cdfba319..2f7a45613 100644
--- a/packages/clients/src/api/marketplace/v2/api.gen.ts
+++ b/packages/clients/src/api/marketplace/v2/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   resolveOneOf,
   urlParams,
@@ -37,7 +37,7 @@ import type {
 } from './types.gen'
 
 /** Marketplace API. */
-export class MarketplaceV2GenAPI extends API {
+export class API extends ParentAPI {
   protected pageOfListImages = (request: Readonly<ListImagesRequest>) =>
     this.client.fetch<ListImagesResponse>(
       {
diff --git a/packages/clients/src/api/marketplace/v2/index.gen.ts b/packages/clients/src/api/marketplace/v2/index.gen.ts
new file mode 100644
index 000000000..d3277f863
--- /dev/null
+++ b/packages/clients/src/api/marketplace/v2/index.gen.ts
@@ -0,0 +1,24 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  Category,
+  GetCategoryRequest,
+  GetImageRequest,
+  GetLocalImageRequest,
+  GetVersionRequest,
+  Image,
+  ListCategoriesRequest,
+  ListCategoriesResponse,
+  ListImagesRequest,
+  ListImagesRequestOrderBy,
+  ListImagesResponse,
+  ListLocalImagesRequest,
+  ListLocalImagesRequestOrderBy,
+  ListLocalImagesResponse,
+  ListVersionsRequest,
+  ListVersionsRequestOrderBy,
+  ListVersionsResponse,
+  LocalImage,
+  Version,
+} from './types.gen'
diff --git a/packages/clients/src/api/marketplace/v2/index.ts b/packages/clients/src/api/marketplace/v2/index.ts
deleted file mode 100644
index 2b817aa71..000000000
--- a/packages/clients/src/api/marketplace/v2/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { MarketplaceV2GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/mnq/index.ts b/packages/clients/src/api/mnq/index.ts
index e6671523d..e49bded05 100644
--- a/packages/clients/src/api/mnq/index.ts
+++ b/packages/clients/src/api/mnq/index.ts
@@ -1 +1 @@
-export * as v1alpha1 from './v1alpha1'
+export * as v1alpha1 from './v1alpha1/index.gen'
diff --git a/packages/clients/src/api/mnq/v1alpha1/api.gen.ts b/packages/clients/src/api/mnq/v1alpha1/api.gen.ts
index 85a6617bf..6cf27b62f 100644
--- a/packages/clients/src/api/mnq/v1alpha1/api.gen.ts
+++ b/packages/clients/src/api/mnq/v1alpha1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -43,7 +43,7 @@ const jsonContentHeaders = {
  *
  * This API allows you to manage Messaging or Queueing brokers.
  */
-export class MnqV1Alpha1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par']
 
diff --git a/packages/clients/src/api/mnq/v1alpha1/index.gen.ts b/packages/clients/src/api/mnq/v1alpha1/index.gen.ts
new file mode 100644
index 000000000..4af66ab7c
--- /dev/null
+++ b/packages/clients/src/api/mnq/v1alpha1/index.gen.ts
@@ -0,0 +1,29 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  CreateCredentialRequest,
+  CreateNamespaceRequest,
+  Credential,
+  CredentialAMQPCreds,
+  CredentialNATSCredsFile,
+  CredentialSQSSNSCreds,
+  CredentialSummary,
+  CredentialSummaryAMQPCreds,
+  CredentialSummarySQSSNSCreds,
+  DeleteCredentialRequest,
+  DeleteNamespaceRequest,
+  GetCredentialRequest,
+  GetNamespaceRequest,
+  ListCredentialsRequest,
+  ListCredentialsRequestOrderBy,
+  ListCredentialsResponse,
+  ListNamespacesRequest,
+  ListNamespacesRequestOrderBy,
+  ListNamespacesResponse,
+  Namespace,
+  NamespaceProtocol,
+  Permissions,
+  UpdateCredentialRequest,
+  UpdateNamespaceRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/mnq/v1alpha1/index.ts b/packages/clients/src/api/mnq/v1alpha1/index.ts
deleted file mode 100644
index ddbd41189..000000000
--- a/packages/clients/src/api/mnq/v1alpha1/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { MnqV1Alpha1GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/rdb/index.ts b/packages/clients/src/api/rdb/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/rdb/index.ts
+++ b/packages/clients/src/api/rdb/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/rdb/v1/api.gen.ts b/packages/clients/src/api/rdb/v1/api.gen.ts
index 051a428f3..b25bce1d7 100644
--- a/packages/clients/src/api/rdb/v1/api.gen.ts
+++ b/packages/clients/src/api/rdb/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   unmarshalScwFile,
   urlParams,
@@ -162,7 +162,7 @@ const jsonContentHeaders = {
 }
 
 /** Database RDB API. */
-export class RdbV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
diff --git a/packages/clients/src/api/rdb/v1/index.gen.ts b/packages/clients/src/api/rdb/v1/index.gen.ts
new file mode 100644
index 000000000..c816836ca
--- /dev/null
+++ b/packages/clients/src/api/rdb/v1/index.gen.ts
@@ -0,0 +1,133 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  ACLRule,
+  ACLRuleAction,
+  ACLRuleDirection,
+  ACLRuleProtocol,
+  ACLRuleRequest,
+  AddInstanceACLRulesRequest,
+  AddInstanceACLRulesResponse,
+  AddInstanceSettingsRequest,
+  AddInstanceSettingsResponse,
+  BackupSchedule,
+  CloneInstanceRequest,
+  CreateDatabaseBackupRequest,
+  CreateDatabaseRequest,
+  CreateEndpointRequest,
+  CreateInstanceFromSnapshotRequest,
+  CreateInstanceRequest,
+  CreateReadReplicaEndpointRequest,
+  CreateReadReplicaRequest,
+  CreateSnapshotRequest,
+  CreateUserRequest,
+  Database,
+  DatabaseBackup,
+  DatabaseBackupStatus,
+  DatabaseEngine,
+  DeleteDatabaseBackupRequest,
+  DeleteDatabaseRequest,
+  DeleteEndpointRequest,
+  DeleteInstanceACLRulesRequest,
+  DeleteInstanceACLRulesResponse,
+  DeleteInstanceRequest,
+  DeleteInstanceSettingsRequest,
+  DeleteInstanceSettingsResponse,
+  DeleteReadReplicaRequest,
+  DeleteSnapshotRequest,
+  DeleteUserRequest,
+  Endpoint,
+  EndpointDirectAccessDetails,
+  EndpointLoadBalancerDetails,
+  EndpointPrivateNetworkDetails,
+  EndpointSpec,
+  EndpointSpecLoadBalancer,
+  EndpointSpecPrivateNetwork,
+  EngineSetting,
+  EngineSettingPropertyType,
+  EngineVersion,
+  ExportDatabaseBackupRequest,
+  GetDatabaseBackupRequest,
+  GetEndpointRequest,
+  GetInstanceCertificateRequest,
+  GetInstanceLogRequest,
+  GetInstanceMetricsRequest,
+  GetInstanceRequest,
+  GetReadReplicaRequest,
+  GetSnapshotRequest,
+  Instance,
+  InstanceLog,
+  InstanceLogStatus,
+  InstanceMetrics,
+  InstanceSetting,
+  InstanceStatus,
+  ListDatabaseBackupsRequest,
+  ListDatabaseBackupsRequestOrderBy,
+  ListDatabaseBackupsResponse,
+  ListDatabaseEnginesRequest,
+  ListDatabaseEnginesResponse,
+  ListDatabasesRequest,
+  ListDatabasesRequestOrderBy,
+  ListDatabasesResponse,
+  ListInstanceACLRulesRequest,
+  ListInstanceACLRulesResponse,
+  ListInstanceLogsDetailsRequest,
+  ListInstanceLogsDetailsResponse,
+  ListInstanceLogsDetailsResponseInstanceLogDetail,
+  ListInstanceLogsRequest,
+  ListInstanceLogsRequestOrderBy,
+  ListInstanceLogsResponse,
+  ListInstancesRequest,
+  ListInstancesRequestOrderBy,
+  ListInstancesResponse,
+  ListNodeTypesRequest,
+  ListNodeTypesResponse,
+  ListPrivilegesRequest,
+  ListPrivilegesRequestOrderBy,
+  ListPrivilegesResponse,
+  ListSnapshotsRequest,
+  ListSnapshotsRequestOrderBy,
+  ListSnapshotsResponse,
+  ListUsersRequest,
+  ListUsersRequestOrderBy,
+  ListUsersResponse,
+  LogsPolicy,
+  Maintenance,
+  MaintenanceStatus,
+  NodeType,
+  NodeTypeStock,
+  NodeTypeVolumeConstraintSizes,
+  NodeTypeVolumeType,
+  Permission,
+  PrepareInstanceLogsRequest,
+  PrepareInstanceLogsResponse,
+  Privilege,
+  PurgeInstanceLogsRequest,
+  ReadReplica,
+  ReadReplicaEndpointSpec,
+  ReadReplicaEndpointSpecDirectAccess,
+  ReadReplicaEndpointSpecPrivateNetwork,
+  ReadReplicaStatus,
+  RenewInstanceCertificateRequest,
+  ResetReadReplicaRequest,
+  RestartInstanceRequest,
+  RestoreDatabaseBackupRequest,
+  SetInstanceACLRulesRequest,
+  SetInstanceACLRulesResponse,
+  SetInstanceSettingsRequest,
+  SetInstanceSettingsResponse,
+  SetPrivilegeRequest,
+  Snapshot,
+  SnapshotStatus,
+  UpdateDatabaseBackupRequest,
+  UpdateInstanceRequest,
+  UpdateSnapshotRequest,
+  UpdateUserRequest,
+  UpgradableVersion,
+  UpgradeInstanceRequest,
+  User,
+  Volume,
+  VolumeType,
+} from './types.gen'
diff --git a/packages/clients/src/api/rdb/v1/index.ts b/packages/clients/src/api/rdb/v1/index.ts
deleted file mode 100644
index 00da1844a..000000000
--- a/packages/clients/src/api/rdb/v1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RdbV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/redis/index.ts b/packages/clients/src/api/redis/index.ts
index 0eb660a02..12f24635c 100644
--- a/packages/clients/src/api/redis/index.ts
+++ b/packages/clients/src/api/redis/index.ts
@@ -1,2 +1,2 @@
 export * as v1alpha1 from './v1alpha1'
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/redis/v1/api.gen.ts b/packages/clients/src/api/redis/v1/api.gen.ts
index db952a40c..14dee0ae7 100644
--- a/packages/clients/src/api/redis/v1/api.gen.ts
+++ b/packages/clients/src/api/redis/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   unmarshalScwFile,
   urlParams,
@@ -77,7 +77,7 @@ const jsonContentHeaders = {
 }
 
 /** Managed Database for Redis™ API. */
-export class RedisV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/redis/v1/index.gen.ts b/packages/clients/src/api/redis/v1/index.gen.ts
new file mode 100644
index 000000000..d7cbefbf2
--- /dev/null
+++ b/packages/clients/src/api/redis/v1/index.gen.ts
@@ -0,0 +1,55 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  ACLRule,
+  ACLRuleSpec,
+  AddAclRulesRequest,
+  AddAclRulesResponse,
+  AddClusterSettingsRequest,
+  AddEndpointsRequest,
+  AddEndpointsResponse,
+  AvailableClusterSetting,
+  AvailableClusterSettingPropertyType,
+  Cluster,
+  ClusterMetricsResponse,
+  ClusterSetting,
+  ClusterSettingsResponse,
+  ClusterStatus,
+  ClusterVersion,
+  CreateClusterRequest,
+  DeleteAclRuleRequest,
+  DeleteClusterRequest,
+  DeleteClusterSettingRequest,
+  DeleteEndpointRequest,
+  Endpoint,
+  EndpointSpec,
+  EndpointSpecPrivateNetworkSpec,
+  EndpointSpecPublicNetworkSpec,
+  GetAclRuleRequest,
+  GetClusterCertificateRequest,
+  GetClusterMetricsRequest,
+  GetClusterRequest,
+  GetEndpointRequest,
+  ListClusterVersionsRequest,
+  ListClusterVersionsResponse,
+  ListClustersRequest,
+  ListClustersRequestOrderBy,
+  ListClustersResponse,
+  ListNodeTypesRequest,
+  ListNodeTypesResponse,
+  MigrateClusterRequest,
+  NodeType,
+  NodeTypeStock,
+  PrivateNetwork,
+  PublicNetwork,
+  RenewClusterCertificateRequest,
+  SetAclRulesRequest,
+  SetAclRulesResponse,
+  SetClusterSettingsRequest,
+  SetEndpointsRequest,
+  SetEndpointsResponse,
+  UpdateClusterRequest,
+  UpdateEndpointRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/redis/v1/index.ts b/packages/clients/src/api/redis/v1/index.ts
deleted file mode 100644
index 0489f4b03..000000000
--- a/packages/clients/src/api/redis/v1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RedisV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/registry/index.ts b/packages/clients/src/api/registry/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/registry/index.ts
+++ b/packages/clients/src/api/registry/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/registry/v1/api.gen.ts b/packages/clients/src/api/registry/v1/api.gen.ts
index c7ebfb6ea..9f85c453c 100644
--- a/packages/clients/src/api/registry/v1/api.gen.ts
+++ b/packages/clients/src/api/registry/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -54,7 +54,7 @@ const jsonContentHeaders = {
  *
  * Container registry API.
  */
-export class RegistryV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams', 'pl-waw']
 
diff --git a/packages/clients/src/api/registry/v1/index.gen.ts b/packages/clients/src/api/registry/v1/index.gen.ts
new file mode 100644
index 000000000..e23dd7a51
--- /dev/null
+++ b/packages/clients/src/api/registry/v1/index.gen.ts
@@ -0,0 +1,31 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CreateNamespaceRequest,
+  DeleteImageRequest,
+  DeleteNamespaceRequest,
+  DeleteTagRequest,
+  GetImageRequest,
+  GetNamespaceRequest,
+  GetTagRequest,
+  Image,
+  ImageStatus,
+  ImageVisibility,
+  ListImagesRequest,
+  ListImagesRequestOrderBy,
+  ListImagesResponse,
+  ListNamespacesRequest,
+  ListNamespacesRequestOrderBy,
+  ListNamespacesResponse,
+  ListTagsRequest,
+  ListTagsRequestOrderBy,
+  ListTagsResponse,
+  Namespace,
+  NamespaceStatus,
+  Tag,
+  TagStatus,
+  UpdateImageRequest,
+  UpdateNamespaceRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/registry/v1/index.ts b/packages/clients/src/api/registry/v1/index.ts
deleted file mode 100644
index 22de9f092..000000000
--- a/packages/clients/src/api/registry/v1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RegistryV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/tem/index.ts b/packages/clients/src/api/tem/index.ts
index e6671523d..e49bded05 100644
--- a/packages/clients/src/api/tem/index.ts
+++ b/packages/clients/src/api/tem/index.ts
@@ -1 +1 @@
-export * as v1alpha1 from './v1alpha1'
+export * as v1alpha1 from './v1alpha1/index.gen'
diff --git a/packages/clients/src/api/tem/v1alpha1/api.gen.ts b/packages/clients/src/api/tem/v1alpha1/api.gen.ts
index a9a80bfa2..bf17dfc74 100644
--- a/packages/clients/src/api/tem/v1alpha1/api.gen.ts
+++ b/packages/clients/src/api/tem/v1alpha1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   unmarshalServiceInfo,
   urlParams,
@@ -52,7 +52,7 @@ const jsonContentHeaders = {
  *
  * Tem.
  */
-export class TemV1Alpha1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available regions of the API. */
   public static readonly LOCALITIES: Region[] = ['fr-par']
 
diff --git a/packages/clients/src/api/tem/v1alpha1/index.gen.ts b/packages/clients/src/api/tem/v1alpha1/index.gen.ts
new file mode 100644
index 000000000..4c8d88fb4
--- /dev/null
+++ b/packages/clients/src/api/tem/v1alpha1/index.gen.ts
@@ -0,0 +1,30 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CancelEmailRequest,
+  CheckDomainRequest,
+  CreateDomainRequest,
+  CreateEmailRequest,
+  CreateEmailRequestAddress,
+  CreateEmailRequestAttachment,
+  CreateEmailResponse,
+  Domain,
+  DomainStatistics,
+  DomainStatus,
+  Email,
+  EmailRcptType,
+  EmailStatus,
+  EmailTry,
+  GetDomainRequest,
+  GetEmailRequest,
+  GetServiceInfoRequest,
+  GetStatisticsRequest,
+  ListDomainsRequest,
+  ListDomainsResponse,
+  ListEmailsRequest,
+  ListEmailsResponse,
+  RevokeDomainRequest,
+  Statistics,
+} from './types.gen'
diff --git a/packages/clients/src/api/tem/v1alpha1/index.ts b/packages/clients/src/api/tem/v1alpha1/index.ts
deleted file mode 100644
index 12cdd4f40..000000000
--- a/packages/clients/src/api/tem/v1alpha1/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { TemV1Alpha1GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/test/index.ts b/packages/clients/src/api/test/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/test/index.ts
+++ b/packages/clients/src/api/test/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/test/v1/api.gen.ts b/packages/clients/src/api/test/v1/api.gen.ts
index 0b71bcd4f..c4ff164c1 100644
--- a/packages/clients/src/api/test/v1/api.gen.ts
+++ b/packages/clients/src/api/test/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -49,7 +49,7 @@ const jsonContentHeaders = {
  * access-key. Then, you can use other test commands by setting the
  * SCW_SECRET_KEY env variable.
  */
-export class TestV1GenAPI extends API {
+export class API extends ParentAPI {
   /**
    * Register a human and return a access-key and a secret-key that must be used
    * in all other commands.
diff --git a/packages/clients/src/api/test/v1/index.gen.ts b/packages/clients/src/api/test/v1/index.gen.ts
new file mode 100644
index 000000000..bc1871f07
--- /dev/null
+++ b/packages/clients/src/api/test/v1/index.gen.ts
@@ -0,0 +1,20 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CreateHumanRequest,
+  DeleteHumanRequest,
+  EyeColors,
+  GetHumanRequest,
+  Human,
+  HumanStatus,
+  ListHumansRequest,
+  ListHumansRequestOrderBy,
+  ListHumansResponse,
+  RegisterRequest,
+  RegisterResponse,
+  RunHumanRequest,
+  SmokeHumanRequest,
+  UpdateHumanRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/test/v1/index.ts b/packages/clients/src/api/test/v1/index.ts
deleted file mode 100644
index e6878d9b9..000000000
--- a/packages/clients/src/api/test/v1/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { TestV1GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/vpc/index.ts b/packages/clients/src/api/vpc/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/vpc/index.ts
+++ b/packages/clients/src/api/vpc/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/vpc/v1/api.gen.ts b/packages/clients/src/api/vpc/v1/api.gen.ts
index 9bd3d2d68..0f0c09299 100644
--- a/packages/clients/src/api/vpc/v1/api.gen.ts
+++ b/packages/clients/src/api/vpc/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -28,7 +28,7 @@ const jsonContentHeaders = {
 }
 
 /** VPC API. */
-export class VpcV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/vpc/v1/index.gen.ts b/packages/clients/src/api/vpc/v1/index.gen.ts
new file mode 100644
index 000000000..8f07d3b27
--- /dev/null
+++ b/packages/clients/src/api/vpc/v1/index.gen.ts
@@ -0,0 +1,13 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export type {
+  CreatePrivateNetworkRequest,
+  DeletePrivateNetworkRequest,
+  GetPrivateNetworkRequest,
+  ListPrivateNetworksRequest,
+  ListPrivateNetworksRequestOrderBy,
+  ListPrivateNetworksResponse,
+  PrivateNetwork,
+  UpdatePrivateNetworkRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/vpc/v1/index.ts b/packages/clients/src/api/vpc/v1/index.ts
deleted file mode 100644
index 2dfc0bf82..000000000
--- a/packages/clients/src/api/vpc/v1/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { VpcV1GenAPI as API } from './api.gen'
-export * from './types.gen'
diff --git a/packages/clients/src/api/vpcgw/index.ts b/packages/clients/src/api/vpcgw/index.ts
index 994706b3e..73ddaf23c 100644
--- a/packages/clients/src/api/vpcgw/index.ts
+++ b/packages/clients/src/api/vpcgw/index.ts
@@ -1 +1 @@
-export * as v1 from './v1'
+export * as v1 from './v1/index.gen'
diff --git a/packages/clients/src/api/vpcgw/v1/api.gen.ts b/packages/clients/src/api/vpcgw/v1/api.gen.ts
index b18db15d9..84828672d 100644
--- a/packages/clients/src/api/vpcgw/v1/api.gen.ts
+++ b/packages/clients/src/api/vpcgw/v1/api.gen.ts
@@ -1,7 +1,7 @@
 // This file was automatically generated. DO NOT EDIT.
 // If you have any remark or suggestion do not hesitate to open an issue.
 import {
-  API,
+  API as ParentAPI,
   enrichForPagination,
   urlParams,
   validatePathParam,
@@ -101,7 +101,7 @@ const jsonContentHeaders = {
 }
 
 /** VPC Public Gateway API. */
-export class VpcgwV1GenAPI extends API {
+export class API extends ParentAPI {
   /** Lists the available zones of the API. */
   public static readonly LOCALITIES: Zone[] = [
     'fr-par-1',
diff --git a/packages/clients/src/api/vpcgw/v1/index.gen.ts b/packages/clients/src/api/vpcgw/v1/index.gen.ts
new file mode 100644
index 000000000..1fd9a1913
--- /dev/null
+++ b/packages/clients/src/api/vpcgw/v1/index.gen.ts
@@ -0,0 +1,69 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+export { API } from './api.gen'
+export * from './content.gen'
+export type {
+  CreateDHCPEntryRequest,
+  CreateDHCPRequest,
+  CreateGatewayNetworkRequest,
+  CreateGatewayRequest,
+  CreateIPRequest,
+  CreatePATRuleRequest,
+  DHCP,
+  DHCPEntry,
+  DHCPEntryType,
+  DeleteDHCPEntryRequest,
+  DeleteDHCPRequest,
+  DeleteGatewayNetworkRequest,
+  DeleteGatewayRequest,
+  DeleteIPRequest,
+  DeletePATRuleRequest,
+  Gateway,
+  GatewayNetwork,
+  GatewayNetworkStatus,
+  GatewayStatus,
+  GatewayType,
+  GetDHCPEntryRequest,
+  GetDHCPRequest,
+  GetGatewayNetworkRequest,
+  GetGatewayRequest,
+  GetIPRequest,
+  GetPATRuleRequest,
+  IP,
+  ListDHCPEntriesRequest,
+  ListDHCPEntriesRequestOrderBy,
+  ListDHCPEntriesResponse,
+  ListDHCPsRequest,
+  ListDHCPsRequestOrderBy,
+  ListDHCPsResponse,
+  ListGatewayNetworksRequest,
+  ListGatewayNetworksRequestOrderBy,
+  ListGatewayNetworksResponse,
+  ListGatewayTypesRequest,
+  ListGatewayTypesResponse,
+  ListGatewaysRequest,
+  ListGatewaysRequestOrderBy,
+  ListGatewaysResponse,
+  ListIPsRequest,
+  ListIPsRequestOrderBy,
+  ListIPsResponse,
+  ListPATRulesRequest,
+  ListPATRulesRequestOrderBy,
+  ListPATRulesResponse,
+  PATRule,
+  PATRuleProtocol,
+  RefreshSSHKeysRequest,
+  SetDHCPEntriesRequest,
+  SetDHCPEntriesRequestEntry,
+  SetDHCPEntriesResponse,
+  SetPATRulesRequest,
+  SetPATRulesRequestRule,
+  SetPATRulesResponse,
+  UpdateDHCPEntryRequest,
+  UpdateDHCPRequest,
+  UpdateGatewayNetworkRequest,
+  UpdateGatewayRequest,
+  UpdateIPRequest,
+  UpdatePATRuleRequest,
+  UpgradeGatewayRequest,
+} from './types.gen'
diff --git a/packages/clients/src/api/vpcgw/v1/index.ts b/packages/clients/src/api/vpcgw/v1/index.ts
deleted file mode 100644
index 7f0b63d4d..000000000
--- a/packages/clients/src/api/vpcgw/v1/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { VpcgwV1GenAPI as API } from './api.gen'
-export * from './content.gen'
-export * from './types.gen'