diff --git a/packages/aws-cdk-lib/assertions/lib/capture.ts b/packages/aws-cdk-lib/assertions/lib/capture.ts
index 95a8cce1c1861..3ffb7cb5b841c 100644
--- a/packages/aws-cdk-lib/assertions/lib/capture.ts
+++ b/packages/aws-cdk-lib/assertions/lib/capture.ts
@@ -1,4 +1,4 @@
-import { Match } from '.';
+import { Match } from './match';
 import { Matcher, MatchResult } from './matcher';
 import { AssertionError } from './private/error';
 import type { Type } from './private/type';
diff --git a/packages/aws-cdk-lib/assertions/lib/private/resources.ts b/packages/aws-cdk-lib/assertions/lib/private/resources.ts
index e8c836b631890..dbe00adc9cf1b 100644
--- a/packages/aws-cdk-lib/assertions/lib/private/resources.ts
+++ b/packages/aws-cdk-lib/assertions/lib/private/resources.ts
@@ -1,4 +1,5 @@
-import { Match, Matcher } from '..';
+import { Match } from '../match';
+import { Matcher } from '../matcher';
 import { AbsentMatch } from './matchers/absent';
 import { formatAllMismatches, matchSection, formatSectionMatchFailure, formatAllMatches } from './section';
 import type { Resource, Template } from './template';
diff --git a/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts b/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts
index 7a4b89cdd5b0c..3d852f0b1daf5 100644
--- a/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts
+++ b/packages/aws-cdk-lib/aws-apigateway/lib/stepfunctions-api.ts
@@ -1,8 +1,8 @@
 import type { Construct } from 'constructs';
-import type { RestApiProps } from '.';
-import { RestApi } from '.';
 import type { RequestContext } from './integrations';
 import { StepFunctionsIntegration } from './integrations/stepfunctions';
+import type { RestApiProps } from './restapi';
+import { RestApi } from './restapi';
 import type * as iam from '../../aws-iam';
 import * as sfn from '../../aws-stepfunctions';
 import { ValidationError } from '../../core/lib/errors';
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/api-mapping.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/api-mapping.ts
index 7258a2e28cd35..feeb7250f84b4 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/api-mapping.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/api-mapping.ts
@@ -1,8 +1,6 @@
 import type { Construct } from 'constructs';
 import type { IDomainName } from './domain-name';
 import type { IStage } from './stage';
-import type { CfnApiMappingProps } from '.././index';
-import { CfnApiMapping } from '.././index';
 import type { IResource } from '../../../core';
 import { Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
@@ -10,6 +8,8 @@ import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
 import type { ApiMappingReference, IApiMappingRef, IApiRef, IDomainNameRef } from '../../../interfaces/generated/aws-apigatewayv2-interfaces.generated';
+import { CfnApiMapping } from '../apigatewayv2.generated';
+import type { CfnApiMappingProps } from '../apigatewayv2.generated';
 
 /**
  * Represents an ApiGatewayV2 ApiMapping resource
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/domain-name.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/domain-name.ts
index 75124b9f79cdd..36e1562bc4cf6 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/domain-name.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/common/domain-name.ts
@@ -1,7 +1,5 @@
 import type { Construct } from 'constructs';
 import type { IpAddressType } from './api';
-import type { CfnDomainNameProps } from '.././index';
-import { CfnDomainName } from '.././index';
 import type { IBucket } from '../../../aws-s3';
 import type { IResource } from '../../../core';
 import { ArnFormat, Lazy, Resource, Stack, Token } from '../../../core';
@@ -11,7 +9,8 @@ import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
 import type { ICertificateRef } from '../../../interfaces/generated/aws-certificatemanager-interfaces.generated';
-import type { DomainNameReference, IDomainNameRef } from '../apigatewayv2.generated';
+import { CfnDomainName } from '../apigatewayv2.generated';
+import type { CfnDomainNameProps, DomainNameReference, IDomainNameRef } from '../apigatewayv2.generated';
 
 /**
  * The minimum version of the SSL protocol that you want API Gateway to use for HTTPS connections.
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts
index d0a8aafa00e7c..4b19033f39cc9 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/api.ts
@@ -7,15 +7,15 @@ import type { IHttpStage, HttpStageOptions } from './stage';
 import { HttpStage } from './stage';
 import type { VpcLinkProps } from './vpc-link';
 import { VpcLink } from './vpc-link';
-import type { CfnApiProps } from '.././index';
-import { CfnApi, HttpApiHelper } from '.././index';
+import { CfnApi } from '../apigatewayv2.generated';
+import { HttpApiHelper } from './api-helper';
 import type { Metric, MetricOptions } from '../../../aws-cloudwatch';
 import type { Duration } from '../../../core';
 import { UnscopedValidationError, ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
-import type { ApiReference, IApiRef } from '../apigatewayv2.generated';
+import type { CfnApiProps, ApiReference, IApiRef } from '../apigatewayv2.generated';
 import type { IApi, IpAddressType } from '../common/api';
 import { ApiBase } from '../common/base';
 import type { DomainMappingOptions } from '../common/stage';
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/authorizer.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/authorizer.ts
index e84c30544e0a5..1c2ebee076a0a 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/authorizer.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/authorizer.ts
@@ -7,9 +7,9 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { AuthorizerReference } from '../apigatewayv2.generated';
+import { CfnAuthorizer } from '../apigatewayv2.generated';
 import type { IAuthorizer } from '../common';
-import type { AuthorizerReference } from '../index';
-import { CfnAuthorizer } from '../index';
 
 /**
  * Supported Authorizer types
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/integration.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/integration.ts
index 1175107e87070..b80ee806db467 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/integration.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/integration.ts
@@ -2,8 +2,6 @@ import type { Construct } from 'constructs';
 import type { IHttpApi, IHttpApiRef } from './api';
 import { toIHttpApi } from './api';
 import type { HttpMethod, IHttpRoute } from './route';
-import type { IntegrationReference } from '.././index';
-import { CfnIntegration } from '.././index';
 import type { IRoleRef } from '../../../aws-iam';
 import type { Duration } from '../../../core';
 import { Aws, Resource } from '../../../core';
@@ -11,6 +9,8 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnIntegration } from '../apigatewayv2.generated';
+import type { IntegrationReference } from '../apigatewayv2.generated';
 import type { IIntegration } from '../common';
 import type { ParameterMapping } from '../parameter-mapping';
 
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/route.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/route.ts
index ce5a0c842b6c8..5337bf9afe5ff 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/route.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/route.ts
@@ -3,14 +3,14 @@ import type { IHttpApi, IHttpApiRef } from './api';
 import { toIHttpApi } from './api';
 import type { HttpRouteAuthorizerConfig, IHttpRouteAuthorizer } from './authorizer';
 import type { HttpRouteIntegration } from './integration';
-import type { CfnRouteProps, RouteReference } from '.././index';
-import { CfnRoute } from '.././index';
 import * as iam from '../../../aws-iam';
 import { Aws, Resource } from '../../../core';
 import { UnscopedValidationError, ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnRoute } from '../apigatewayv2.generated';
+import type { CfnRouteProps, RouteReference } from '../apigatewayv2.generated';
 import type { IRoute } from '../common';
 
 /**
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/stage.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/stage.ts
index 92a8852183a30..3b19bfa44eebd 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/stage.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/stage.ts
@@ -8,11 +8,11 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { IStageRef } from '../apigatewayv2.generated';
+import { CfnStage } from '../apigatewayv2.generated';
 import type { StageOptions, IStage, StageAttributes } from '../common';
 import type { IApi } from '../common/api';
 import { StageBase } from '../common/base';
-import type { IStageRef } from '../index';
-import { CfnStage } from '../index';
 
 const DEFAULT_STAGE_NAME = '$default';
 
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/vpc-link.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/vpc-link.ts
index c2daf53633faa..06eae419c4376 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/vpc-link.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/http/vpc-link.ts
@@ -4,8 +4,8 @@ import type { IResource } from '../../../core';
 import { Lazy, Names, Resource } from '../../../core';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
-import type { IVpcLinkRef, VpcLinkReference } from '../index';
-import { CfnVpcLink } from '../index';
+import type { IVpcLinkRef, VpcLinkReference } from '../apigatewayv2.generated';
+import { CfnVpcLink } from '../apigatewayv2.generated';
 
 /**
  * Represents an API Gateway VpcLink
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/api.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/api.ts
index b5aa16117aaa4..722db03f77a52 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/api.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/api.ts
@@ -1,7 +1,6 @@
 import type { Construct } from 'constructs';
 import type { WebSocketRouteOptions } from './route';
 import { WebSocketRoute } from './route';
-import { CfnApi } from '.././index';
 import type { IGrantable } from '../../../aws-iam';
 import { Grant } from '../../../aws-iam';
 import { ArnFormat, Stack, Token } from '../../../core';
@@ -9,6 +8,7 @@ import { UnscopedValidationError, ValidationError } from '../../../core/lib/erro
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnApi } from '../apigatewayv2.generated';
 import type { ApiReference, IApiRef } from '../apigatewayv2.generated';
 import type { IApi, IpAddressType } from '../common/api';
 import { ApiBase } from '../common/base';
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/authorizer.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/authorizer.ts
index 94ff3af8a9a14..1234445ee2c0a 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/authorizer.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/authorizer.ts
@@ -6,9 +6,9 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import type { AuthorizerReference } from '../apigatewayv2.generated';
+import { CfnAuthorizer } from '../apigatewayv2.generated';
 import type { IAuthorizer } from '../common';
-import type { AuthorizerReference } from '../index';
-import { CfnAuthorizer } from '../index';
 
 /**
  * Supported Authorizer types
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/integration.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/integration.ts
index 8f3b9f6d55bb7..7ebafac869387 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/integration.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/integration.ts
@@ -1,8 +1,6 @@
 import type { Construct } from 'constructs';
 import type { IWebSocketApi, IWebSocketApiRef } from './api';
 import type { IWebSocketRoute } from './route';
-import type { IntegrationReference } from '.././index';
-import { CfnIntegration } from '.././index';
 import type { IRole } from '../../../aws-iam';
 import type { Duration } from '../../../core';
 import { Resource } from '../../../core';
@@ -10,6 +8,8 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnIntegration } from '../apigatewayv2.generated';
+import type { IntegrationReference } from '../apigatewayv2.generated';
 import type { IIntegration } from '../common';
 
 /**
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/route.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/route.ts
index 3f0e3f4032baa..7b9e352d53c6d 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/route.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/route.ts
@@ -3,13 +3,13 @@ import type { IWebSocketApi } from './api';
 import type { IWebSocketRouteAuthorizer } from './authorizer';
 import { WebSocketNoneAuthorizer } from './authorizer';
 import type { WebSocketRouteIntegration } from './integration';
-import type { RouteReference } from '.././index';
-import { CfnRoute, CfnRouteResponse } from '.././index';
 import { Resource } from '../../../core';
 import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnRoute, CfnRouteResponse } from '../apigatewayv2.generated';
+import type { RouteReference } from '../apigatewayv2.generated';
 import type { IRoute } from '../common';
 
 /**
diff --git a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/stage.ts b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/stage.ts
index 6c6cb97bd6174..3869e01b4cd64 100644
--- a/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/stage.ts
+++ b/packages/aws-cdk-lib/aws-apigatewayv2/lib/websocket/stage.ts
@@ -1,6 +1,5 @@
 import type { Construct } from 'constructs';
 import type { IWebSocketApi } from './api';
-import { CfnStage } from '.././index';
 import { AccessLogField, AccessLogFormat } from '../../../aws-apigateway';
 import type { IGrantable } from '../../../aws-iam';
 import { Grant } from '../../../aws-iam';
@@ -9,6 +8,7 @@ import { ValidationError } from '../../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../../core/lib/metadata-resource';
 import { lit } from '../../../core/lib/private/literal-string';
 import { propertyInjectable } from '../../../core/lib/prop-injectable';
+import { CfnStage } from '../apigatewayv2.generated';
 import type { StageOptions, IApi, IStage, StageAttributes } from '../common';
 import { StageBase } from '../common/base';
 
diff --git a/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts b/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts
index e5a6d31545852..9b5e95809c725 100644
--- a/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts
+++ b/packages/aws-cdk-lib/aws-autoscaling/lib/auto-scaling-group.ts
@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { AutoScalingGroupRequireImdsv2Aspect } from './aspects';
+import { AutoScalingGroupRequireImdsv2Aspect } from './aspects/require-imdsv2-aspect';
 import type { CfnAutoScalingGroupProps } from './autoscaling.generated';
 import { CfnAutoScalingGroup, CfnLaunchConfiguration } from './autoscaling.generated';
 import type { BasicLifecycleHookProps } from './lifecycle-hook';
diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/vpc-origin.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/vpc-origin.ts
index 760d5c9eab39d..314b1386e141f 100644
--- a/packages/aws-cdk-lib/aws-cloudfront/lib/vpc-origin.ts
+++ b/packages/aws-cdk-lib/aws-cloudfront/lib/vpc-origin.ts
@@ -1,8 +1,8 @@
 import type { Construct } from 'constructs';
 import type { IVpcOriginRef, VpcOriginReference } from './cloudfront.generated';
 import { CfnVpcOrigin } from './cloudfront.generated';
-import type { OriginProtocolPolicy } from '../';
-import { OriginSslPolicy } from '../';
+import type { OriginProtocolPolicy } from './distribution';
+import { OriginSslPolicy } from './web-distribution';
 import type { IInstance } from '../../aws-ec2';
 import type { IApplicationLoadBalancer, INetworkLoadBalancer } from '../../aws-elasticloadbalancingv2';
 import type {
diff --git a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts
index e29fa5ed543df..423f5e32247d5 100644
--- a/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts
+++ b/packages/aws-cdk-lib/aws-codepipeline-actions/lib/codebuild/build-action.ts
@@ -1,5 +1,4 @@
 import type { Construct } from 'constructs';
-import { CodeStarConnectionsSourceAction } from '..';
 import * as codebuild from '../../../aws-codebuild';
 import * as codepipeline from '../../../aws-codepipeline';
 import * as iam from '../../../aws-iam';
@@ -7,6 +6,7 @@ import * as cdk from '../../../core';
 import { lit } from '../../../core/lib/private/literal-string';
 import { Action } from '../action';
 import { CodeCommitSourceAction } from '../codecommit/source-action';
+import { CodeStarConnectionsSourceAction } from '../codestar-connections/source-action';
 
 /**
  * The type of the CodeBuild action that determines its CodePipeline Category -
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts b/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts
index 53892b6286432..fda955f27f8e0 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/bastion-host.ts
@@ -1,10 +1,10 @@
 import type { Construct } from 'constructs';
-import type { InstanceReference } from '.';
-import { InstanceArchitecture, InstanceClass, InstanceSize, InstanceType } from '.';
 import type { CloudFormationInit } from './cfn-init';
 import type { Connections } from './connections';
+import type { InstanceReference } from './ec2.generated';
 import type { ApplyCloudFormationInitOptions, IInstance } from './instance';
 import { Instance } from './instance';
+import { InstanceArchitecture, InstanceClass, InstanceSize, InstanceType } from './instance-types';
 import type { IMachineImage } from './machine-image';
 import { AmazonLinuxCpuType, MachineImage } from './machine-image';
 import type { IPeer } from './peer';
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance.ts
index ec22b045fe073..9e66a9b3e5970 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/instance.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/instance.ts
@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { InstanceRequireImdsv2Aspect } from './aspects';
+import { InstanceRequireImdsv2Aspect } from './aspects/require-imdsv2-aspect';
 import type { CloudFormationInit } from './cfn-init';
 import type { IConnectable } from './connections';
 import { Connections } from './connections';
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/common.ts b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/common.ts
index cd38260292653..ac13052c55124 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/common.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/common.ts
@@ -1,6 +1,7 @@
 import type { Construct } from 'constructs';
 import { lookupImage } from './utils';
 import { UserData } from '../user-data';
+import { OperatingSystemType } from './os-type';
 
 /**
  * Common options across all generations.
@@ -144,19 +145,6 @@ export interface MachineImageConfig {
   readonly userData: UserData;
 }
 
-/**
- * The OS type of a particular image
- */
-export enum OperatingSystemType {
-  LINUX,
-  WINDOWS,
-  /**
-   * Used when the type of the operating system is not known
-   * (for example, for imported Auto-Scaling Groups).
-   */
-  UNKNOWN,
-}
-
 /**
  * CPU type
  */
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/index.ts b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/index.ts
index ad5829128310e..c204309a3e099 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/index.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/index.ts
@@ -3,3 +3,4 @@ export * from './amazon-linux2';
 export * from './machine-image';
 export * from './amazon-linux-2022';
 export * from './amazon-linux-2023';
+export * from './os-type';
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts
index e380b29f27402..7aa3e41edb19f 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/machine-image.ts
@@ -6,7 +6,7 @@ import { AmazonLinux2023ImageSsmParameter, AmazonLinux2023Kernel } from './amazo
 import type { AmazonLinux2ImageSsmParameterProps } from './amazon-linux2';
 import { AmazonLinux2ImageSsmParameter, AmazonLinux2Kernel } from './amazon-linux2';
 import type { IMachineImage, MachineImageConfig } from './common';
-import { AmazonLinuxCpuType, AmazonLinuxEdition, AmazonLinuxGeneration, AmazonLinuxStorage, AmazonLinuxVirt, OperatingSystemType } from './common';
+import { AmazonLinuxCpuType, AmazonLinuxEdition, AmazonLinuxGeneration, AmazonLinuxStorage, AmazonLinuxVirt } from './common';
 import { lookupImage } from './utils';
 import * as ssm from '../../../aws-ssm';
 import * as cxschema from '../../../cloud-assembly-schema';
@@ -15,6 +15,7 @@ import { lit } from '../../../core/lib/private/literal-string';
 import type * as cxapi from '../../../cx-api';
 import { UserData } from '../user-data';
 import { WindowsVersion } from '../windows-versions';
+import { OperatingSystemType } from './os-type';
 
 /**
  * Factory functions for standard Amazon Machine Image objects.
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/machine-image/os-type.ts b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/os-type.ts
new file mode 100644
index 0000000000000..bc43dad53a4a6
--- /dev/null
+++ b/packages/aws-cdk-lib/aws-ec2/lib/machine-image/os-type.ts
@@ -0,0 +1,12 @@
+/**
+ * The OS type of a particular image
+ */
+export enum OperatingSystemType {
+  LINUX,
+  WINDOWS,
+  /**
+   * Used when the type of the operating system is not known
+   * (for example, for imported Auto-Scaling Groups).
+   */
+  UNKNOWN,
+}
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts b/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts
index 300a1f5d1e393..7fc861720054e 100644
--- a/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts
+++ b/packages/aws-cdk-lib/aws-ec2/lib/user-data.ts
@@ -1,4 +1,4 @@
-import { OperatingSystemType } from './machine-image';
+import { OperatingSystemType } from './machine-image/os-type';
 import type { IBucketRef } from '../../aws-s3';
 import type { Resource, CfnResource } from '../../core';
 import { Fn, Stack, UnscopedValidationError } from '../../core';
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/alias.ts b/packages/aws-cdk-lib/aws-lambda/lib/alias.ts
index b6b3261f544b4..f9940ef5d8c0b 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/alias.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/alias.ts
@@ -340,3 +340,14 @@ export interface VersionWeight {
    */
   readonly weight: number;
 }
+
+/**
+ * @internal
+ */
+export function addAlias(scope: Construct, version: IVersion, aliasName: string, options: AliasOptions = {}) {
+  return new Alias(scope, `Alias${aliasName}`, {
+    aliasName,
+    version,
+    ...options,
+  });
+}
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts b/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts
index 22ed732dcfbc6..4521ee9d836f4 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/function-base.ts
@@ -1,6 +1,7 @@
 import { createHash } from 'crypto';
 import type { Construct, Node } from 'constructs';
 import type { AliasOptions } from './alias';
+import { addAlias } from './alias';
 import type { Architecture } from './architecture';
 import type { EventInvokeConfigOptions } from './event-invoke-config';
 import { EventInvokeConfig } from './event-invoke-config';
@@ -14,7 +15,7 @@ import type { FunctionReference, IFunctionRef, VersionReference } from './lambda
 import { CfnPermission } from './lambda.generated';
 import type { Permission } from './permission';
 import type { TenancyConfig } from './tenancy-config';
-import { addAlias, flatMap } from './util';
+import { flatMap } from './util';
 import type * as cloudwatch from '../../aws-cloudwatch';
 import type * as ec2 from '../../aws-ec2';
 import * as iam from '../../aws-iam';
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts
index 56e9d8f376406..9092f21b489ae 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/function.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/function.ts
@@ -2,6 +2,7 @@ import type { Construct, IConstruct } from 'constructs';
 import type { AdotInstrumentationConfig } from './adot-layers';
 import { AdotLambdaExecWrapper } from './adot-layers';
 import type { AliasOptions, Alias } from './alias';
+import { addAlias } from './alias';
 import { Architecture } from './architecture';
 import type { Code, CodeConfig } from './code';
 import type { DurableConfig } from './durable-config';
@@ -25,7 +26,6 @@ import { determineLatestNodeRuntime, Runtime, RuntimeFamily } from './runtime';
 import type { RuntimeManagementMode } from './runtime-management';
 import type { SnapStartConf } from './snapstart-config';
 import type { TenancyConfig } from './tenancy-config';
-import { addAlias } from './util';
 import * as cloudwatch from '../../aws-cloudwatch';
 import type { IProfilingGroup } from '../../aws-codeguruprofiler';
 import { ProfilingGroup, ComputePlatform } from '../../aws-codeguruprofiler';
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts b/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts
index 6022457ae66f3..f12ada3dc8b5b 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/lambda-version.ts
@@ -1,6 +1,7 @@
 import { ArtifactMetadataEntryType } from '@aws-cdk/cloud-assembly-schema';
 import type { Construct } from 'constructs';
 import type { Alias, AliasOptions } from './alias';
+import { addAlias } from './alias';
 import type { Architecture } from './architecture';
 import type { EventInvokeConfigOptions } from './event-invoke-config';
 import { Function } from './function';
@@ -8,7 +9,6 @@ import type { IFunction } from './function-base';
 import { QualifiedFunctionBase } from './function-base';
 import type { IVersionRef, VersionReference } from './lambda.generated';
 import { CfnVersion } from './lambda.generated';
-import { addAlias } from './util';
 import type * as cloudwatch from '../../aws-cloudwatch';
 import { Fn, Lazy, RemovalPolicy, Token } from '../../core';
 import { ValidationError } from '../../core/lib/errors';
diff --git a/packages/aws-cdk-lib/aws-lambda/lib/util.ts b/packages/aws-cdk-lib/aws-lambda/lib/util.ts
index 9067a74df5592..9af869ae6c2eb 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/util.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/util.ts
@@ -1,16 +1,3 @@
-import type { Construct } from 'constructs';
-import type { AliasOptions } from './alias';
-import { Alias } from './alias';
-import type { IVersion } from './lambda-version';
-
-export function addAlias(scope: Construct, version: IVersion, aliasName: string, options: AliasOptions = {}) {
-  return new Alias(scope, `Alias${aliasName}`, {
-    aliasName,
-    version,
-    ...options,
-  });
-}
-
 /**
  * Map a function over an array and concatenate the results
  */
diff --git a/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts b/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts
index 23785dcff03bc..8eec714c7c735 100644
--- a/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts
+++ b/packages/aws-cdk-lib/aws-logs/lib/query-definition.ts
@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { CfnQueryDefinition } from '.';
+import { CfnQueryDefinition } from './logs.generated';
 import { Annotations, Resource, ValidationError } from '../../core';
 import { addConstructMetadata } from '../../core/lib/metadata-resource';
 import { lit } from '../../core/lib/private/literal-string';
diff --git a/packages/aws-cdk-lib/aws-logs/lib/transformer.ts b/packages/aws-cdk-lib/aws-logs/lib/transformer.ts
index 307e8ccfeb00a..5356d83ffdc6e 100644
--- a/packages/aws-cdk-lib/aws-logs/lib/transformer.ts
+++ b/packages/aws-cdk-lib/aws-logs/lib/transformer.ts
@@ -17,7 +17,7 @@
  */
 
 import type { Construct } from 'constructs';
-import { CfnTransformer } from '.';
+import { CfnTransformer } from './logs.generated';
 import { Resource, Token, ValidationError, UnscopedValidationError } from '../../core';
 import { addConstructMetadata } from '../../core/lib/metadata-resource';
 import { lit } from '../../core/lib/private/literal-string';
diff --git a/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts b/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts
index a82059c24bb4e..37792397735ec 100644
--- a/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts
+++ b/packages/aws-cdk-lib/aws-rds/lib/database-secret.ts
@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from './private/util';
+import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from './private/constants';
 import type * as kms from '../../aws-kms';
 import * as secretsmanager from '../../aws-secretsmanager';
 import { Aws, Names } from '../../core';
diff --git a/packages/aws-cdk-lib/aws-rds/lib/private/constants.ts b/packages/aws-cdk-lib/aws-rds/lib/private/constants.ts
new file mode 100644
index 0000000000000..5db25902f1e43
--- /dev/null
+++ b/packages/aws-cdk-lib/aws-rds/lib/private/constants.ts
@@ -0,0 +1 @@
+export const DEFAULT_PASSWORD_EXCLUDE_CHARS = " %+~`#$&*()|[]{}:;<>?!'/@\"\\";
diff --git a/packages/aws-cdk-lib/aws-rds/lib/private/util.ts b/packages/aws-cdk-lib/aws-rds/lib/private/util.ts
index 2e72b967b7439..7ea61d3d19027 100644
--- a/packages/aws-cdk-lib/aws-rds/lib/private/util.ts
+++ b/packages/aws-cdk-lib/aws-rds/lib/private/util.ts
@@ -9,16 +9,7 @@ import { DatabaseSecret } from '../database-secret';
 import type { IEngine } from '../engine';
 import type { CommonRotationUserOptions } from '../props';
 import { Credentials, SnapshotCredentials } from '../props';
-
-/**
- * The default set of characters we exclude from generated passwords for database users.
- * It's a combination of characters that have a tendency to cause problems in shell scripts,
- * some engine-specific characters (for example, Oracle doesn't like '@' in its passwords),
- * and some that trip up other services, like DMS.
- *
- * This constant is private to the RDS module.
- */
-export const DEFAULT_PASSWORD_EXCLUDE_CHARS = " %+~`#$&*()|[]{}:;<>?!'/@\"\\";
+import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from './constants';
 
 /** Common base of `DatabaseInstanceProps` and `DatabaseClusterBaseProps` that has only the S3 props */
 export interface DatabaseS3ImportExportProps {
diff --git a/packages/aws-cdk-lib/aws-rds/test/database-secret.test.ts b/packages/aws-cdk-lib/aws-rds/test/database-secret.test.ts
index 35d19fc5e77b3..593cc5832139f 100644
--- a/packages/aws-cdk-lib/aws-rds/test/database-secret.test.ts
+++ b/packages/aws-cdk-lib/aws-rds/test/database-secret.test.ts
@@ -2,7 +2,7 @@ import { Template } from '../../assertions';
 import type { CfnResource } from '../../core';
 import { Stack } from '../../core';
 import { DatabaseSecret } from '../lib';
-import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from '../lib/private/util';
+import { DEFAULT_PASSWORD_EXCLUDE_CHARS } from '../lib/private/constants';
 
 describe('database secret', () => {
   test('create a database secret', () => {
diff --git a/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts b/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts
index 651d1180e2895..12c71fe7e1ae8 100644
--- a/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts
+++ b/packages/aws-cdk-lib/aws-route53/lib/vpc-endpoint-service-domain-name.ts
@@ -1,12 +1,12 @@
 import { Construct } from 'constructs';
+import type { IPublicHostedZone } from './hosted-zone';
+import { TxtRecord } from './record-set';
 import type { IVPCEndpointServiceRef } from '../../aws-ec2';
 import { Fn, Names, Stack } from '../../core';
 import { ValidationError } from '../../core/lib/errors';
 import { md5hash } from '../../core/lib/helpers-internal';
 import { lit } from '../../core/lib/private/literal-string';
 import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from '../../custom-resources';
-import type { IPublicHostedZone } from '../lib';
-import { TxtRecord } from '../lib';
 
 /**
  * Properties to configure a VPC Endpoint Service domain name
diff --git a/packages/aws-cdk-lib/aws-s3/lib/bucket.ts b/packages/aws-cdk-lib/aws-s3/lib/bucket.ts
index 8743a45202d5b..5a315796e2294 100644
--- a/packages/aws-cdk-lib/aws-s3/lib/bucket.ts
+++ b/packages/aws-cdk-lib/aws-s3/lib/bucket.ts
@@ -4,8 +4,8 @@ import { BucketGrants } from './bucket-grants';
 import { BucketPolicy } from './bucket-policy';
 import { BucketReflection } from './bucket-reflection';
 import type { IBucketNotificationDestination } from './destination';
-import { BucketAutoDeleteObjects } from './mixins';
-import { BucketNotifications } from './notifications-resource';
+import { BucketAutoDeleteObjects } from './mixins/bucket';
+import { BucketNotifications } from './notifications-resource/notifications-resource';
 import * as perms from './perms';
 import type { LifecycleRule, StorageClass } from './rule';
 import type { BucketReference, IBucketRef } from './s3.generated';
diff --git a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/private/cluster-utils.ts b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/private/cluster-utils.ts
index 7ce1fb207d6ad..fb7037ce7bfa1 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/private/cluster-utils.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/private/cluster-utils.ts
@@ -1,7 +1,7 @@
 import * as cdk from '../../../../core';
 import { UnscopedValidationError } from '../../../../core';
 import { lit } from '../../../../core/lib/private/literal-string';
-import { EmrCreateCluster } from '../emr-create-cluster';
+import type { EmrCreateCluster } from '../emr-create-cluster';
 import type { EmrModifyInstanceGroupByName } from '../emr-modify-instance-group-by-name';
 
 /**
@@ -160,7 +160,7 @@ export function InstanceFleetConfigPropertyToJson(property: EmrCreateCluster.Ins
   if (!property.targetSpotCapacity && !property.targetOnDemandCapacity) {
     throw new UnscopedValidationError(lit`AtLeastOneTargetCapacityRequired`, 'At least one of targetSpotCapacity and targetOnDemandCapacity should be greater than 0');
   }
-  if (property.instanceFleetType === EmrCreateCluster.InstanceRoleType.MASTER) {
+  if (property.instanceFleetType === 'MASTER') {
     if (property.targetSpotCapacity && property.targetOnDemandCapacity) {
       throw new UnscopedValidationError(lit`MasterInstanceFleetOnlyOneCapacityType`, 'For a master instance fleet, only one of targetSpotCapacity and targetOnDemandCapacity can be specified');
     }
diff --git a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/custom-state.ts b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/custom-state.ts
index e919745164c22..34723d2e7a73d 100644
--- a/packages/aws-cdk-lib/aws-stepfunctions/lib/states/custom-state.ts
+++ b/packages/aws-cdk-lib/aws-stepfunctions/lib/states/custom-state.ts
@@ -1,5 +1,5 @@
 import type { Construct } from 'constructs';
-import { Chain } from '..';
+import { Chain } from '../chain';
 import { State } from './state';
 import { Annotations } from '../../../core/';
 import type { CatchProps, IChainable, INextable, QueryLanguage, RetryProps } from '../types';
diff --git a/packages/aws-cdk-lib/core/lib/asset-staging.ts b/packages/aws-cdk-lib/core/lib/asset-staging.ts
index d39aca0e8ec42..7d4ff6d287ced 100644
--- a/packages/aws-cdk-lib/core/lib/asset-staging.ts
+++ b/packages/aws-cdk-lib/core/lib/asset-staging.ts
@@ -12,11 +12,12 @@ import { FileSystem } from './fs';
 import { clearLargeFileFingerprintCache } from './fs/fingerprint';
 import { Names } from './names';
 import { AssetBundlingVolumeCopy, AssetBundlingBindMount } from './private/asset-staging';
+import { BUNDLING_INPUT_DIR, BUNDLING_OUTPUT_DIR } from './private/bundling-constants';
 import { Cache } from './private/cache';
-import { Stack } from './stack';
 import { Stage } from './stage';
 import * as cxapi from '../../cx-api';
 import { lit } from './private/literal-string';
+import { Stack } from './stack';
 
 const ARCHIVE_EXTENSIONS = ['.tar.gz', '.zip', '.jar', '.tar', '.tgz'];
 
@@ -79,12 +80,12 @@ export class AssetStaging extends Construct {
   /**
    * The directory inside the bundling container into which the asset sources will be mounted.
    */
-  public static readonly BUNDLING_INPUT_DIR = '/asset-input';
+  public static readonly BUNDLING_INPUT_DIR = BUNDLING_INPUT_DIR;
 
   /**
    * The directory inside the bundling container into which the bundled output should be written.
    */
-  public static readonly BUNDLING_OUTPUT_DIR = '/asset-output';
+  public static readonly BUNDLING_OUTPUT_DIR = BUNDLING_OUTPUT_DIR;
 
   /**
    * Clears the asset hash cache
diff --git a/packages/aws-cdk-lib/core/lib/context-provider.ts b/packages/aws-cdk-lib/core/lib/context-provider.ts
index aab8b1b78c420..607259ba976ab 100644
--- a/packages/aws-cdk-lib/core/lib/context-provider.ts
+++ b/packages/aws-cdk-lib/core/lib/context-provider.ts
@@ -2,11 +2,11 @@ import type { Construct } from 'constructs';
 import { Node } from 'constructs';
 import { Annotations } from './annotations';
 import { ValidationError } from './errors';
+import { lit } from './private/literal-string';
 import { Stack } from './stack';
 import { Token } from './token';
 import type * as cxschema from '../../cloud-assembly-schema';
 import * as cxapi from '../../cx-api';
-import { lit } from './private/literal-string';
 
 /**
  */
diff --git a/packages/aws-cdk-lib/core/lib/private/asset-staging.ts b/packages/aws-cdk-lib/core/lib/private/asset-staging.ts
index 0113f4c0f0e77..71e580d8c3a7a 100644
--- a/packages/aws-cdk-lib/core/lib/private/asset-staging.ts
+++ b/packages/aws-cdk-lib/core/lib/private/asset-staging.ts
@@ -2,7 +2,7 @@ import type { SpawnSyncOptions } from 'child_process';
 import { spawnSync } from 'child_process';
 import * as crypto from 'crypto';
 import * as os from 'os';
-import { AssetStaging } from '../asset-staging';
+import { BUNDLING_INPUT_DIR, BUNDLING_OUTPUT_DIR } from './bundling-constants';
 import type { BundlingOptions } from '../bundling';
 import { ExecutionError } from '../errors';
 import { lit } from './literal-string';
@@ -59,17 +59,17 @@ export class AssetBundlingBindMount extends AssetBundlingBase {
       environment: this.options.environment,
       entrypoint: this.options.entrypoint,
       workingDirectory:
-        this.options.workingDirectory ?? AssetStaging.BUNDLING_INPUT_DIR,
+        this.options.workingDirectory ?? BUNDLING_INPUT_DIR,
       securityOpt: this.options.securityOpt ?? '',
       volumesFrom: this.options.volumesFrom,
       volumes: [
         {
           hostPath: this.options.sourcePath,
-          containerPath: AssetStaging.BUNDLING_INPUT_DIR,
+          containerPath: BUNDLING_INPUT_DIR,
         },
         {
           hostPath: this.options.bundleDir,
-          containerPath: AssetStaging.BUNDLING_OUTPUT_DIR,
+          containerPath: BUNDLING_OUTPUT_DIR,
         },
         ...(this.options.volumes ?? []),
       ],
@@ -130,13 +130,13 @@ export class AssetBundlingVolumeCopy extends AssetBundlingBase {
       '--name',
       this.copyContainerName,
       '-v',
-      `${this.inputVolumeName}:${AssetStaging.BUNDLING_INPUT_DIR}`,
+      `${this.inputVolumeName}:${BUNDLING_INPUT_DIR}`,
       '-v',
-      `${this.outputVolumeName}:${AssetStaging.BUNDLING_OUTPUT_DIR}`,
+      `${this.outputVolumeName}:${BUNDLING_OUTPUT_DIR}`,
       'public.ecr.aws/docker/library/alpine',
       'sh',
       '-c',
-      `mkdir -p ${AssetStaging.BUNDLING_INPUT_DIR} && chown -R ${user} ${AssetStaging.BUNDLING_OUTPUT_DIR} && chown -R ${user} ${AssetStaging.BUNDLING_INPUT_DIR}`,
+      `mkdir -p ${BUNDLING_INPUT_DIR} && chown -R ${user} ${BUNDLING_OUTPUT_DIR} && chown -R ${user} ${BUNDLING_INPUT_DIR}`,
     ]);
   }
 
@@ -155,7 +155,7 @@ export class AssetBundlingVolumeCopy extends AssetBundlingBase {
     dockerExec([
       'cp',
       `${sourcePath}/.`,
-      `${this.copyContainerName}:${AssetStaging.BUNDLING_INPUT_DIR}`,
+      `${this.copyContainerName}:${BUNDLING_INPUT_DIR}`,
     ]);
   }
 
@@ -166,7 +166,7 @@ export class AssetBundlingVolumeCopy extends AssetBundlingBase {
   private copyOutputTo(outputPath: string) {
     dockerExec([
       'cp',
-      `${this.copyContainerName}:${AssetStaging.BUNDLING_OUTPUT_DIR}/.`,
+      `${this.copyContainerName}:${BUNDLING_OUTPUT_DIR}/.`,
       outputPath,
     ]);
   }
@@ -186,7 +186,7 @@ export class AssetBundlingVolumeCopy extends AssetBundlingBase {
       environment: this.options.environment,
       entrypoint: this.options.entrypoint,
       workingDirectory:
-        this.options.workingDirectory ?? AssetStaging.BUNDLING_INPUT_DIR,
+        this.options.workingDirectory ?? BUNDLING_INPUT_DIR,
       securityOpt: this.options.securityOpt ?? '',
       volumes: this.options.volumes,
       volumesFrom: [
diff --git a/packages/aws-cdk-lib/core/lib/private/bundling-constants.ts b/packages/aws-cdk-lib/core/lib/private/bundling-constants.ts
new file mode 100644
index 0000000000000..f67300a32cc4e
--- /dev/null
+++ b/packages/aws-cdk-lib/core/lib/private/bundling-constants.ts
@@ -0,0 +1,4 @@
+/** @internal */
+export const BUNDLING_INPUT_DIR = '/asset-input';
+/** @internal */
+export const BUNDLING_OUTPUT_DIR = '/asset-output';
diff --git a/packages/aws-cdk-lib/core/lib/stack.ts b/packages/aws-cdk-lib/core/lib/stack.ts
index 6c5a3dd81f158..636f5a6bac05e 100644
--- a/packages/aws-cdk-lib/core/lib/stack.ts
+++ b/packages/aws-cdk-lib/core/lib/stack.ts
@@ -1887,8 +1887,10 @@ import { addDependency } from './deps';
 import { Names } from './names';
 import { Reference } from './reference';
 import type { IResolvable } from './resolvable';
-import type { IStackSynthesizer, ISynthesisSession } from './stack-synthesizers';
-import { DefaultStackSynthesizer, LegacyStackSynthesizer, BOOTSTRAP_QUALIFIER_CONTEXT, isReusableStackSynthesizer } from './stack-synthesizers';
+import type { IStackSynthesizer, ISynthesisSession } from './stack-synthesizers/types';
+import { DefaultStackSynthesizer, BOOTSTRAP_QUALIFIER_CONTEXT } from './stack-synthesizers/default-synthesizer';
+import { LegacyStackSynthesizer } from './stack-synthesizers/legacy';
+import { isReusableStackSynthesizer } from './stack-synthesizers/types';
 import { StringSpecializer } from './helpers-internal/string-specializer';
 import { Stage } from './stage';
 import type { ITaggable } from './tag-manager';
diff --git a/packages/aws-cdk-lib/triggers/lib/trigger-function.ts b/packages/aws-cdk-lib/triggers/lib/trigger-function.ts
index 9adf70fccb17e..d3f93b70498e4 100644
--- a/packages/aws-cdk-lib/triggers/lib/trigger-function.ts
+++ b/packages/aws-cdk-lib/triggers/lib/trigger-function.ts
@@ -1,6 +1,6 @@
 import type { Construct } from 'constructs';
-import type { ITrigger, TriggerOptions } from '.';
-import { Trigger } from '.';
+import type { ITrigger, TriggerOptions } from './trigger';
+import { Trigger } from './trigger';
 import * as lambda from '../../aws-lambda';
 import { addConstructMetadata, MethodMetadata } from '../../core/lib/metadata-resource';
 import { propertyInjectable } from '../../core/lib/prop-injectable';