diff --git a/src/cloudflare/resources/accounts/accounts.py b/src/cloudflare/resources/accounts/accounts.py
index 60a434a32af..e6e9d0721a4 100644
--- a/src/cloudflare/resources/accounts/accounts.py
+++ b/src/cloudflare/resources/accounts/accounts.py
@@ -15,14 +15,6 @@
     RolesResourceWithStreamingResponse,
     AsyncRolesResourceWithStreamingResponse,
 )
-from .tokens import (
-    TokensResource,
-    AsyncTokensResource,
-    TokensResourceWithRawResponse,
-    AsyncTokensResourceWithRawResponse,
-    TokensResourceWithStreamingResponse,
-    AsyncTokensResourceWithStreamingResponse,
-)
 from .members import (
     MembersResource,
     AsyncMembersResource,
@@ -54,7 +46,14 @@
     SubscriptionsResourceWithStreamingResponse,
     AsyncSubscriptionsResourceWithStreamingResponse,
 )
-from .tokens.tokens import TokensResource, AsyncTokensResource
+from .tokens.tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.accounts import account_list_params, account_create_params, account_update_params
 from ...types.accounts.account import Account
diff --git a/src/cloudflare/resources/addressing/addressing.py b/src/cloudflare/resources/addressing/addressing.py
index 31485b662e2..e5ce952404e 100644
--- a/src/cloudflare/resources/addressing/addressing.py
+++ b/src/cloudflare/resources/addressing/addressing.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .prefixes import (
-    PrefixesResource,
-    AsyncPrefixesResource,
-    PrefixesResourceWithRawResponse,
-    AsyncPrefixesResourceWithRawResponse,
-    PrefixesResourceWithStreamingResponse,
-    AsyncPrefixesResourceWithStreamingResponse,
-)
 from .services import (
     ServicesResource,
     AsyncServicesResource,
@@ -20,7 +12,15 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .address_maps import (
+from .prefixes.prefixes import (
+    PrefixesResource,
+    AsyncPrefixesResource,
+    PrefixesResourceWithRawResponse,
+    AsyncPrefixesResourceWithRawResponse,
+    PrefixesResourceWithStreamingResponse,
+    AsyncPrefixesResourceWithStreamingResponse,
+)
+from .address_maps.address_maps import (
     AddressMapsResource,
     AsyncAddressMapsResource,
     AddressMapsResourceWithRawResponse,
@@ -28,7 +28,7 @@
     AddressMapsResourceWithStreamingResponse,
     AsyncAddressMapsResourceWithStreamingResponse,
 )
-from .loa_documents import (
+from .loa_documents.loa_documents import (
     LOADocumentsResource,
     AsyncLOADocumentsResource,
     LOADocumentsResourceWithRawResponse,
@@ -36,8 +36,7 @@
     LOADocumentsResourceWithStreamingResponse,
     AsyncLOADocumentsResourceWithStreamingResponse,
 )
-from .prefixes.prefixes import PrefixesResource, AsyncPrefixesResource
-from .regional_hostnames import (
+from .regional_hostnames.regional_hostnames import (
     RegionalHostnamesResource,
     AsyncRegionalHostnamesResource,
     RegionalHostnamesResourceWithRawResponse,
@@ -45,9 +44,6 @@
     RegionalHostnamesResourceWithStreamingResponse,
     AsyncRegionalHostnamesResourceWithStreamingResponse,
 )
-from .address_maps.address_maps import AddressMapsResource, AsyncAddressMapsResource
-from .loa_documents.loa_documents import LOADocumentsResource, AsyncLOADocumentsResource
-from .regional_hostnames.regional_hostnames import RegionalHostnamesResource, AsyncRegionalHostnamesResource
 
 __all__ = ["AddressingResource", "AsyncAddressingResource"]
 
diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py
index 119ee1134f4..f22011802f1 100644
--- a/src/cloudflare/resources/addressing/prefixes/prefixes.py
+++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py
@@ -6,7 +6,7 @@
 
 import httpx
 
-from .bgp import (
+from .bgp.bgp import (
     BGPResource,
     AsyncBGPResource,
     BGPResourceWithRawResponse,
@@ -14,7 +14,6 @@
     BGPResourceWithStreamingResponse,
     AsyncBGPResourceWithStreamingResponse,
 )
-from .bgp.bgp import BGPResource, AsyncBGPResource
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._utils import (
     maybe_transform,
diff --git a/src/cloudflare/resources/ai/ai.py b/src/cloudflare/resources/ai/ai.py
index a4a0d159b39..09421073da3 100644
--- a/src/cloudflare/resources/ai/ai.py
+++ b/src/cloudflare/resources/ai/ai.py
@@ -7,14 +7,6 @@
 
 import httpx
 
-from .models import (
-    ModelsResource,
-    AsyncModelsResource,
-    ModelsResourceWithRawResponse,
-    AsyncModelsResourceWithRawResponse,
-    ModelsResourceWithStreamingResponse,
-    AsyncModelsResourceWithStreamingResponse,
-)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     required_args,
@@ -31,7 +23,14 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .models.models import ModelsResource, AsyncModelsResource
+from .models.models import (
+    ModelsResource,
+    AsyncModelsResource,
+    ModelsResourceWithRawResponse,
+    AsyncModelsResourceWithRawResponse,
+    ModelsResourceWithStreamingResponse,
+    AsyncModelsResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
 from ...types.ai.ai_run_response import AIRunResponse
 
diff --git a/src/cloudflare/resources/alerting/alerting.py b/src/cloudflare/resources/alerting/alerting.py
index b7e2c928ca5..26acc6c7b63 100644
--- a/src/cloudflare/resources/alerting/alerting.py
+++ b/src/cloudflare/resources/alerting/alerting.py
@@ -20,14 +20,6 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .destinations import (
-    DestinationsResource,
-    AsyncDestinationsResource,
-    DestinationsResourceWithRawResponse,
-    AsyncDestinationsResourceWithRawResponse,
-    DestinationsResourceWithStreamingResponse,
-    AsyncDestinationsResourceWithStreamingResponse,
-)
 from .available_alerts import (
     AvailableAlertsResource,
     AsyncAvailableAlertsResource,
@@ -36,7 +28,14 @@
     AvailableAlertsResourceWithStreamingResponse,
     AsyncAvailableAlertsResourceWithStreamingResponse,
 )
-from .destinations.destinations import DestinationsResource, AsyncDestinationsResource
+from .destinations.destinations import (
+    DestinationsResource,
+    AsyncDestinationsResource,
+    DestinationsResourceWithRawResponse,
+    AsyncDestinationsResourceWithRawResponse,
+    DestinationsResourceWithStreamingResponse,
+    AsyncDestinationsResourceWithStreamingResponse,
+)
 
 __all__ = ["AlertingResource", "AsyncAlertingResource"]
 
diff --git a/src/cloudflare/resources/api_gateway/api_gateway.py b/src/cloudflare/resources/api_gateway/api_gateway.py
index a5b5779b44a..780055b0239 100644
--- a/src/cloudflare/resources/api_gateway/api_gateway.py
+++ b/src/cloudflare/resources/api_gateway/api_gateway.py
@@ -10,7 +10,17 @@
     SchemasResourceWithStreamingResponse,
     AsyncSchemasResourceWithStreamingResponse,
 )
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -18,8 +28,7 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .discovery import (
+from .discovery.discovery import (
     DiscoveryResource,
     AsyncDiscoveryResource,
     DiscoveryResourceWithRawResponse,
@@ -27,7 +36,7 @@
     DiscoveryResourceWithStreamingResponse,
     AsyncDiscoveryResourceWithStreamingResponse,
 )
-from .operations import (
+from .operations.operations import (
     OperationsResource,
     AsyncOperationsResource,
     OperationsResourceWithRawResponse,
@@ -35,8 +44,7 @@
     OperationsResourceWithStreamingResponse,
     AsyncOperationsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .user_schemas import (
+from .user_schemas.user_schemas import (
     UserSchemasResource,
     AsyncUserSchemasResource,
     UserSchemasResourceWithRawResponse,
@@ -44,17 +52,7 @@
     UserSchemasResourceWithStreamingResponse,
     AsyncUserSchemasResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
-)
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .discovery.discovery import DiscoveryResource, AsyncDiscoveryResource
-from .expression_template import (
+from .expression_template.expression_template import (
     ExpressionTemplateResource,
     AsyncExpressionTemplateResource,
     ExpressionTemplateResourceWithRawResponse,
@@ -62,9 +60,6 @@
     ExpressionTemplateResourceWithStreamingResponse,
     AsyncExpressionTemplateResourceWithStreamingResponse,
 )
-from .operations.operations import OperationsResource, AsyncOperationsResource
-from .user_schemas.user_schemas import UserSchemasResource, AsyncUserSchemasResource
-from .expression_template.expression_template import ExpressionTemplateResource, AsyncExpressionTemplateResource
 
 __all__ = ["APIGatewayResource", "AsyncAPIGatewayResource"]
 
diff --git a/src/cloudflare/resources/botnet_feed/botnet_feed.py b/src/cloudflare/resources/botnet_feed/botnet_feed.py
index c31a81b701f..b61dfc867fc 100755
--- a/src/cloudflare/resources/botnet_feed/botnet_feed.py
+++ b/src/cloudflare/resources/botnet_feed/botnet_feed.py
@@ -10,7 +10,9 @@
     ASNResourceWithStreamingResponse,
     AsyncASNResourceWithStreamingResponse,
 )
-from .configs import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configs.configs import (
     ConfigsResource,
     AsyncConfigsResource,
     ConfigsResourceWithRawResponse,
@@ -18,9 +20,6 @@
     ConfigsResourceWithStreamingResponse,
     AsyncConfigsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .configs.configs import ConfigsResource, AsyncConfigsResource
 
 __all__ = ["BotnetFeedResource", "AsyncBotnetFeedResource"]
 
diff --git a/src/cloudflare/resources/cloudforce_one/cloudforce_one.py b/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
index 721b604e94f..0194bb8910d 100644
--- a/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
+++ b/src/cloudflare/resources/cloudforce_one/cloudforce_one.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .requests import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .requests.requests import (
     RequestsResource,
     AsyncRequestsResource,
     RequestsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     RequestsResourceWithStreamingResponse,
     AsyncRequestsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .requests.requests import RequestsResource, AsyncRequestsResource
 
 __all__ = ["CloudforceOneResource", "AsyncCloudforceOneResource"]
 
diff --git a/src/cloudflare/resources/dns/analytics/analytics.py b/src/cloudflare/resources/dns/analytics/analytics.py
index 12826983e89..f81519e40af 100644
--- a/src/cloudflare/resources/dns/analytics/analytics.py
+++ b/src/cloudflare/resources/dns/analytics/analytics.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .reports import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .reports.reports import (
     ReportsResource,
     AsyncReportsResource,
     ReportsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ReportsResourceWithStreamingResponse,
     AsyncReportsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .reports.reports import ReportsResource, AsyncReportsResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 
diff --git a/src/cloudflare/resources/dns/dns.py b/src/cloudflare/resources/dns/dns.py
index ff32eb8c40d..07001eea193 100644
--- a/src/cloudflare/resources/dns/dns.py
+++ b/src/cloudflare/resources/dns/dns.py
@@ -18,7 +18,9 @@
     RecordsResourceWithStreamingResponse,
     AsyncRecordsResourceWithStreamingResponse,
 )
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -26,8 +28,7 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .analytics import (
+from .analytics.analytics import (
     AnalyticsResource,
     AsyncAnalyticsResource,
     AnalyticsResourceWithRawResponse,
@@ -35,8 +36,7 @@
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .zone_transfers import (
+from .zone_transfers.zone_transfers import (
     ZoneTransfersResource,
     AsyncZoneTransfersResource,
     ZoneTransfersResourceWithRawResponse,
@@ -44,9 +44,6 @@
     ZoneTransfersResourceWithStreamingResponse,
     AsyncZoneTransfersResourceWithStreamingResponse,
 )
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
-from .zone_transfers.zone_transfers import ZoneTransfersResource, AsyncZoneTransfersResource
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
 
diff --git a/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py b/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py
index a42a0751fd1..2176aa7a60d 100644
--- a/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py
+++ b/src/cloudflare/resources/dns/zone_transfers/zone_transfers.py
@@ -34,14 +34,6 @@
     IncomingResourceWithStreamingResponse,
     AsyncIncomingResourceWithStreamingResponse,
 )
-from .outgoing import (
-    OutgoingResource,
-    AsyncOutgoingResource,
-    OutgoingResourceWithRawResponse,
-    AsyncOutgoingResourceWithRawResponse,
-    OutgoingResourceWithStreamingResponse,
-    AsyncOutgoingResourceWithStreamingResponse,
-)
 from ...._compat import cached_property
 from .force_axfr import (
     ForceAXFRResource,
@@ -52,7 +44,14 @@
     AsyncForceAXFRResourceWithStreamingResponse,
 )
 from ...._resource import SyncAPIResource, AsyncAPIResource
-from .outgoing.outgoing import OutgoingResource, AsyncOutgoingResource
+from .outgoing.outgoing import (
+    OutgoingResource,
+    AsyncOutgoingResource,
+    OutgoingResourceWithRawResponse,
+    AsyncOutgoingResourceWithRawResponse,
+    OutgoingResourceWithStreamingResponse,
+    AsyncOutgoingResourceWithStreamingResponse,
+)
 
 __all__ = ["ZoneTransfersResource", "AsyncZoneTransfersResource"]
 
diff --git a/src/cloudflare/resources/dns_firewall/analytics/analytics.py b/src/cloudflare/resources/dns_firewall/analytics/analytics.py
index 12826983e89..f81519e40af 100644
--- a/src/cloudflare/resources/dns_firewall/analytics/analytics.py
+++ b/src/cloudflare/resources/dns_firewall/analytics/analytics.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .reports import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .reports.reports import (
     ReportsResource,
     AsyncReportsResource,
     ReportsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ReportsResourceWithStreamingResponse,
     AsyncReportsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .reports.reports import ReportsResource, AsyncReportsResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 
diff --git a/src/cloudflare/resources/dns_firewall/dns_firewall.py b/src/cloudflare/resources/dns_firewall/dns_firewall.py
index 57cf7e69202..5261afa946f 100644
--- a/src/cloudflare/resources/dns_firewall/dns_firewall.py
+++ b/src/cloudflare/resources/dns_firewall/dns_firewall.py
@@ -12,14 +12,6 @@
     async_maybe_transform,
 )
 from ..._compat import cached_property
-from .analytics import (
-    AnalyticsResource,
-    AsyncAnalyticsResource,
-    AnalyticsResourceWithRawResponse,
-    AsyncAnalyticsResourceWithRawResponse,
-    AnalyticsResourceWithStreamingResponse,
-    AsyncAnalyticsResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
     to_raw_response_wrapper,
@@ -38,7 +30,14 @@
 )
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
+from .analytics.analytics import (
+    AnalyticsResource,
+    AsyncAnalyticsResource,
+    AnalyticsResourceWithRawResponse,
+    AsyncAnalyticsResourceWithRawResponse,
+    AnalyticsResourceWithStreamingResponse,
+    AsyncAnalyticsResourceWithStreamingResponse,
+)
 from ...types.dns_firewall import (
     dns_firewall_edit_params,
     dns_firewall_list_params,
diff --git a/src/cloudflare/resources/durable_objects/durable_objects.py b/src/cloudflare/resources/durable_objects/durable_objects.py
index 4f85a271750..9e78ad2275b 100644
--- a/src/cloudflare/resources/durable_objects/durable_objects.py
+++ b/src/cloudflare/resources/durable_objects/durable_objects.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .namespaces import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["DurableObjectsResource", "AsyncDurableObjectsResource"]
 
diff --git a/src/cloudflare/resources/email_routing/email_routing.py b/src/cloudflare/resources/email_routing/email_routing.py
index 2c67b5cf8d2..f7611f86486 100644
--- a/src/cloudflare/resources/email_routing/email_routing.py
+++ b/src/cloudflare/resources/email_routing/email_routing.py
@@ -14,14 +14,6 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
-from .rules import (
-    RulesResource,
-    AsyncRulesResource,
-    RulesResourceWithRawResponse,
-    AsyncRulesResourceWithRawResponse,
-    RulesResourceWithStreamingResponse,
-    AsyncRulesResourceWithStreamingResponse,
-)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -44,7 +36,14 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .rules.rules import RulesResource, AsyncRulesResource
+from .rules.rules import (
+    RulesResource,
+    AsyncRulesResource,
+    RulesResourceWithRawResponse,
+    AsyncRulesResourceWithRawResponse,
+    RulesResourceWithStreamingResponse,
+    AsyncRulesResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
 from ...types.email_routing import email_routing_enable_params, email_routing_disable_params
 from ...types.email_routing.settings import Settings
diff --git a/src/cloudflare/resources/email_security/email_security.py b/src/cloudflare/resources/email_security/email_security.py
index 9c7863f0b09..77aaf13b7c5 100644
--- a/src/cloudflare/resources/email_security/email_security.py
+++ b/src/cloudflare/resources/email_security/email_security.py
@@ -2,7 +2,17 @@
 
 from __future__ import annotations
 
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .submissions import (
+    SubmissionsResource,
+    AsyncSubmissionsResource,
+    SubmissionsResourceWithRawResponse,
+    AsyncSubmissionsResourceWithRawResponse,
+    SubmissionsResourceWithStreamingResponse,
+    AsyncSubmissionsResourceWithStreamingResponse,
+)
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -10,9 +20,7 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .investigate import (
+from .investigate.investigate import (
     InvestigateResource,
     AsyncInvestigateResource,
     InvestigateResourceWithRawResponse,
@@ -20,16 +28,6 @@
     InvestigateResourceWithStreamingResponse,
     AsyncInvestigateResourceWithStreamingResponse,
 )
-from .submissions import (
-    SubmissionsResource,
-    AsyncSubmissionsResource,
-    SubmissionsResourceWithRawResponse,
-    AsyncSubmissionsResourceWithRawResponse,
-    SubmissionsResourceWithStreamingResponse,
-    AsyncSubmissionsResourceWithStreamingResponse,
-)
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .investigate.investigate import InvestigateResource, AsyncInvestigateResource
 
 __all__ = ["EmailSecurityResource", "AsyncEmailSecurityResource"]
 
diff --git a/src/cloudflare/resources/firewall/firewall.py b/src/cloudflare/resources/firewall/firewall.py
index e5ff2fe9261..daffc54b2b6 100644
--- a/src/cloudflare/resources/firewall/firewall.py
+++ b/src/cloudflare/resources/firewall/firewall.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .waf import (
-    WAFResource,
-    AsyncWAFResource,
-    WAFResourceWithRawResponse,
-    AsyncWAFResourceWithRawResponse,
-    WAFResourceWithStreamingResponse,
-    AsyncWAFResourceWithStreamingResponse,
-)
 from .rules import (
     RulesResource,
     AsyncRulesResource,
@@ -18,7 +10,14 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .waf.waf import WAFResource, AsyncWAFResource
+from .waf.waf import (
+    WAFResource,
+    AsyncWAFResource,
+    WAFResourceWithRawResponse,
+    AsyncWAFResourceWithRawResponse,
+    WAFResourceWithStreamingResponse,
+    AsyncWAFResourceWithStreamingResponse,
+)
 from .ua_rules import (
     UARulesResource,
     AsyncUARulesResource,
diff --git a/src/cloudflare/resources/firewall/waf/waf.py b/src/cloudflare/resources/firewall/waf/waf.py
index 12d89bef38b..cb86f03df71 100644
--- a/src/cloudflare/resources/firewall/waf/waf.py
+++ b/src/cloudflare/resources/firewall/waf/waf.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .packages import (
-    PackagesResource,
-    AsyncPackagesResource,
-    PackagesResourceWithRawResponse,
-    AsyncPackagesResourceWithRawResponse,
-    PackagesResourceWithStreamingResponse,
-    AsyncPackagesResourceWithStreamingResponse,
-)
 from .overrides import (
     OverridesResource,
     AsyncOverridesResource,
@@ -20,7 +12,14 @@
 )
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
-from .packages.packages import PackagesResource, AsyncPackagesResource
+from .packages.packages import (
+    PackagesResource,
+    AsyncPackagesResource,
+    PackagesResourceWithRawResponse,
+    AsyncPackagesResourceWithRawResponse,
+    PackagesResourceWithStreamingResponse,
+    AsyncPackagesResourceWithStreamingResponse,
+)
 
 __all__ = ["WAFResource", "AsyncWAFResource"]
 
diff --git a/src/cloudflare/resources/hostnames/hostnames.py b/src/cloudflare/resources/hostnames/hostnames.py
index 6e10918a6d8..80ec7252072 100644
--- a/src/cloudflare/resources/hostnames/hostnames.py
+++ b/src/cloudflare/resources/hostnames/hostnames.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .settings.settings import SettingsResource, AsyncSettingsResource
 
 __all__ = ["HostnamesResource", "AsyncHostnamesResource"]
 
diff --git a/src/cloudflare/resources/images/images.py b/src/cloudflare/resources/images/images.py
index 28ba10b0a3c..692ab89c259 100644
--- a/src/cloudflare/resources/images/images.py
+++ b/src/cloudflare/resources/images/images.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .v1 import (
+from .v1.v1 import (
     V1Resource,
     AsyncV1Resource,
     V1ResourceWithRawResponse,
@@ -10,7 +10,7 @@
     V1ResourceWithStreamingResponse,
     AsyncV1ResourceWithStreamingResponse,
 )
-from .v2 import (
+from .v2.v2 import (
     V2Resource,
     AsyncV2Resource,
     V2ResourceWithRawResponse,
@@ -18,8 +18,6 @@
     V2ResourceWithStreamingResponse,
     AsyncV2ResourceWithStreamingResponse,
 )
-from .v1.v1 import V1Resource, AsyncV1Resource
-from .v2.v2 import V2Resource, AsyncV2Resource
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 
diff --git a/src/cloudflare/resources/intel/intel.py b/src/cloudflare/resources/intel/intel.py
index 38d57b025c5..a581d557b90 100644
--- a/src/cloudflare/resources/intel/intel.py
+++ b/src/cloudflare/resources/intel/intel.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .asn import (
-    ASNResource,
-    AsyncASNResource,
-    ASNResourceWithRawResponse,
-    AsyncASNResourceWithRawResponse,
-    ASNResourceWithStreamingResponse,
-    AsyncASNResourceWithStreamingResponse,
-)
 from .dns import (
     DNSResource,
     AsyncDNSResource,
@@ -34,14 +26,13 @@
     WhoisResourceWithStreamingResponse,
     AsyncWhoisResourceWithStreamingResponse,
 )
-from .asn.asn import ASNResource, AsyncASNResource
-from .domains import (
-    DomainsResource,
-    AsyncDomainsResource,
-    DomainsResourceWithRawResponse,
-    AsyncDomainsResourceWithRawResponse,
-    DomainsResourceWithStreamingResponse,
-    AsyncDomainsResourceWithStreamingResponse,
+from .asn.asn import (
+    ASNResource,
+    AsyncASNResource,
+    ASNResourceWithRawResponse,
+    AsyncASNResourceWithRawResponse,
+    ASNResourceWithStreamingResponse,
+    AsyncASNResourceWithStreamingResponse,
 )
 from .ip_lists import (
     IPListsResource,
@@ -69,14 +60,13 @@
     DomainHistoryResourceWithStreamingResponse,
     AsyncDomainHistoryResourceWithStreamingResponse,
 )
-from .domains.domains import DomainsResource, AsyncDomainsResource
-from .indicator_feeds import (
-    IndicatorFeedsResource,
-    AsyncIndicatorFeedsResource,
-    IndicatorFeedsResourceWithRawResponse,
-    AsyncIndicatorFeedsResourceWithRawResponse,
-    IndicatorFeedsResourceWithStreamingResponse,
-    AsyncIndicatorFeedsResourceWithStreamingResponse,
+from .domains.domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
 )
 from .miscategorizations import (
     MiscategorizationsResource,
@@ -86,7 +76,15 @@
     MiscategorizationsResourceWithStreamingResponse,
     AsyncMiscategorizationsResourceWithStreamingResponse,
 )
-from .attack_surface_report import (
+from .indicator_feeds.indicator_feeds import (
+    IndicatorFeedsResource,
+    AsyncIndicatorFeedsResource,
+    IndicatorFeedsResourceWithRawResponse,
+    AsyncIndicatorFeedsResourceWithRawResponse,
+    IndicatorFeedsResourceWithStreamingResponse,
+    AsyncIndicatorFeedsResourceWithStreamingResponse,
+)
+from .attack_surface_report.attack_surface_report import (
     AttackSurfaceReportResource,
     AsyncAttackSurfaceReportResource,
     AttackSurfaceReportResourceWithRawResponse,
@@ -94,8 +92,6 @@
     AttackSurfaceReportResourceWithStreamingResponse,
     AsyncAttackSurfaceReportResourceWithStreamingResponse,
 )
-from .indicator_feeds.indicator_feeds import IndicatorFeedsResource, AsyncIndicatorFeedsResource
-from .attack_surface_report.attack_surface_report import AttackSurfaceReportResource, AsyncAttackSurfaceReportResource
 
 __all__ = ["IntelResource", "AsyncIntelResource"]
 
diff --git a/src/cloudflare/resources/kv/kv.py b/src/cloudflare/resources/kv/kv.py
index 688b32ded00..021d59fad17 100644
--- a/src/cloudflare/resources/kv/kv.py
+++ b/src/cloudflare/resources/kv/kv.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .namespaces import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["KVResource", "AsyncKVResource"]
 
diff --git a/src/cloudflare/resources/load_balancers/load_balancers.py b/src/cloudflare/resources/load_balancers/load_balancers.py
index 7e9a72d6f2d..0285862d2c7 100644
--- a/src/cloudflare/resources/load_balancers/load_balancers.py
+++ b/src/cloudflare/resources/load_balancers/load_balancers.py
@@ -6,14 +6,6 @@
 
 import httpx
 
-from .pools import (
-    PoolsResource,
-    AsyncPoolsResource,
-    PoolsResourceWithRawResponse,
-    AsyncPoolsResourceWithRawResponse,
-    PoolsResourceWithStreamingResponse,
-    AsyncPoolsResourceWithStreamingResponse,
-)
 from .regions import (
     RegionsResource,
     AsyncRegionsResource,
@@ -27,14 +19,6 @@
     maybe_transform,
     async_maybe_transform,
 )
-from .monitors import (
-    MonitorsResource,
-    AsyncMonitorsResource,
-    MonitorsResourceWithRawResponse,
-    AsyncMonitorsResourceWithRawResponse,
-    MonitorsResourceWithStreamingResponse,
-    AsyncMonitorsResourceWithStreamingResponse,
-)
 from .previews import (
     PreviewsResource,
     AsyncPreviewsResource,
@@ -60,10 +44,24 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .pools.pools import PoolsResource, AsyncPoolsResource
+from .pools.pools import (
+    PoolsResource,
+    AsyncPoolsResource,
+    PoolsResourceWithRawResponse,
+    AsyncPoolsResourceWithRawResponse,
+    PoolsResourceWithStreamingResponse,
+    AsyncPoolsResourceWithStreamingResponse,
+)
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
-from .monitors.monitors import MonitorsResource, AsyncMonitorsResource
+from .monitors.monitors import (
+    MonitorsResource,
+    AsyncMonitorsResource,
+    MonitorsResourceWithRawResponse,
+    AsyncMonitorsResourceWithRawResponse,
+    MonitorsResourceWithStreamingResponse,
+    AsyncMonitorsResourceWithStreamingResponse,
+)
 from ...types.load_balancers import (
     SteeringPolicy,
     SessionAffinity,
diff --git a/src/cloudflare/resources/logpush/logpush.py b/src/cloudflare/resources/logpush/logpush.py
index 199756c7509..11b9fc672e6 100644
--- a/src/cloudflare/resources/logpush/logpush.py
+++ b/src/cloudflare/resources/logpush/logpush.py
@@ -18,14 +18,6 @@
     JobsResourceWithStreamingResponse,
     AsyncJobsResourceWithStreamingResponse,
 )
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
-)
 from .validate import (
     ValidateResource,
     AsyncValidateResource,
@@ -44,7 +36,14 @@
     AsyncOwnershipResourceWithStreamingResponse,
 )
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .datasets.datasets import DatasetsResource, AsyncDatasetsResource
+from .datasets.datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
 
 __all__ = ["LogpushResource", "AsyncLogpushResource"]
 
diff --git a/src/cloudflare/resources/logs/control/control.py b/src/cloudflare/resources/logs/control/control.py
index 99906e1377a..79e5950e9e5 100644
--- a/src/cloudflare/resources/logs/control/control.py
+++ b/src/cloudflare/resources/logs/control/control.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .cmb import (
+from .cmb.cmb import (
     CmbResource,
     AsyncCmbResource,
     CmbResourceWithRawResponse,
@@ -10,7 +10,6 @@
     CmbResourceWithStreamingResponse,
     AsyncCmbResourceWithStreamingResponse,
 )
-from .cmb.cmb import CmbResource, AsyncCmbResource
 from .retention import (
     RetentionResource,
     AsyncRetentionResource,
diff --git a/src/cloudflare/resources/logs/logs.py b/src/cloudflare/resources/logs/logs.py
index 9e20c287267..aec8832b960 100644
--- a/src/cloudflare/resources/logs/logs.py
+++ b/src/cloudflare/resources/logs/logs.py
@@ -10,7 +10,9 @@
     RayIDResourceWithStreamingResponse,
     AsyncRayIDResourceWithStreamingResponse,
 )
-from .control import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .control.control import (
     ControlResource,
     AsyncControlResource,
     ControlResourceWithRawResponse,
@@ -18,7 +20,7 @@
     ControlResourceWithStreamingResponse,
     AsyncControlResourceWithStreamingResponse,
 )
-from .received import (
+from .received.received import (
     ReceivedResource,
     AsyncReceivedResource,
     ReceivedResourceWithRawResponse,
@@ -26,10 +28,6 @@
     ReceivedResourceWithStreamingResponse,
     AsyncReceivedResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .control.control import ControlResource, AsyncControlResource
-from .received.received import ReceivedResource, AsyncReceivedResource
 
 __all__ = ["LogsResource", "AsyncLogsResource"]
 
diff --git a/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py b/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
index 878635d4ed1..350f2492895 100644
--- a/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
+++ b/src/cloudflare/resources/magic_network_monitoring/magic_network_monitoring.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .rules import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .rules.rules import (
     RulesResource,
     AsyncRulesResource,
     RulesResourceWithRawResponse,
@@ -10,7 +12,7 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .configs import (
+from .configs.configs import (
     ConfigsResource,
     AsyncConfigsResource,
     ConfigsResourceWithRawResponse,
@@ -18,10 +20,6 @@
     ConfigsResourceWithStreamingResponse,
     AsyncConfigsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .rules.rules import RulesResource, AsyncRulesResource
-from .configs.configs import ConfigsResource, AsyncConfigsResource
 
 __all__ = ["MagicNetworkMonitoringResource", "AsyncMagicNetworkMonitoringResource"]
 
diff --git a/src/cloudflare/resources/magic_transit/magic_transit.py b/src/cloudflare/resources/magic_transit/magic_transit.py
index 1f640317c84..20c5d489320 100644
--- a/src/cloudflare/resources/magic_transit/magic_transit.py
+++ b/src/cloudflare/resources/magic_transit/magic_transit.py
@@ -10,22 +10,6 @@
     AppsResourceWithStreamingResponse,
     AsyncAppsResourceWithStreamingResponse,
 )
-from .pcaps import (
-    PCAPsResource,
-    AsyncPCAPsResource,
-    PCAPsResourceWithRawResponse,
-    AsyncPCAPsResourceWithRawResponse,
-    PCAPsResourceWithStreamingResponse,
-    AsyncPCAPsResourceWithStreamingResponse,
-)
-from .sites import (
-    SitesResource,
-    AsyncSitesResource,
-    SitesResourceWithRawResponse,
-    AsyncSitesResourceWithRawResponse,
-    SitesResourceWithStreamingResponse,
-    AsyncSitesResourceWithStreamingResponse,
-)
 from .routes import (
     RoutesResource,
     AsyncRoutesResource,
@@ -52,8 +36,22 @@
     GRETunnelsResourceWithStreamingResponse,
     AsyncGRETunnelsResourceWithStreamingResponse,
 )
-from .pcaps.pcaps import PCAPsResource, AsyncPCAPsResource
-from .sites.sites import SitesResource, AsyncSitesResource
+from .pcaps.pcaps import (
+    PCAPsResource,
+    AsyncPCAPsResource,
+    PCAPsResourceWithRawResponse,
+    AsyncPCAPsResourceWithRawResponse,
+    PCAPsResourceWithStreamingResponse,
+    AsyncPCAPsResourceWithStreamingResponse,
+)
+from .sites.sites import (
+    SitesResource,
+    AsyncSitesResource,
+    SitesResourceWithRawResponse,
+    AsyncSitesResourceWithRawResponse,
+    SitesResourceWithStreamingResponse,
+    AsyncSitesResourceWithStreamingResponse,
+)
 from .ipsec_tunnels import (
     IPSECTunnelsResource,
     AsyncIPSECTunnelsResource,
diff --git a/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py b/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py
index 4c8e1082d68..5fc7bf53f7c 100644
--- a/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py
+++ b/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py
@@ -20,14 +20,6 @@
     AsyncSettingsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .hostnames import (
-    HostnamesResource,
-    AsyncHostnamesResource,
-    HostnamesResourceWithRawResponse,
-    AsyncHostnamesResourceWithRawResponse,
-    HostnamesResourceWithStreamingResponse,
-    AsyncHostnamesResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
     to_raw_response_wrapper,
@@ -38,7 +30,14 @@
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import AsyncPaginator, make_request_options
-from .hostnames.hostnames import HostnamesResource, AsyncHostnamesResource
+from .hostnames.hostnames import (
+    HostnamesResource,
+    AsyncHostnamesResource,
+    HostnamesResourceWithRawResponse,
+    AsyncHostnamesResourceWithRawResponse,
+    HostnamesResourceWithStreamingResponse,
+    AsyncHostnamesResourceWithStreamingResponse,
+)
 from ...types.origin_tls_client_auth import origin_tls_client_auth_create_params
 from ...types.origin_tls_client_auth.zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull
 
diff --git a/src/cloudflare/resources/pages/pages.py b/src/cloudflare/resources/pages/pages.py
index 8cdeb531b8b..4d880c318b7 100644
--- a/src/cloudflare/resources/pages/pages.py
+++ b/src/cloudflare/resources/pages/pages.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .projects import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .projects.projects import (
     ProjectsResource,
     AsyncProjectsResource,
     ProjectsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ProjectsResourceWithStreamingResponse,
     AsyncProjectsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .projects.projects import ProjectsResource, AsyncProjectsResource
 
 __all__ = ["PagesResource", "AsyncPagesResource"]
 
diff --git a/src/cloudflare/resources/pages/projects/deployments/deployments.py b/src/cloudflare/resources/pages/projects/deployments/deployments.py
index aed1fcd671e..aa7f586ff08 100644
--- a/src/cloudflare/resources/pages/projects/deployments/deployments.py
+++ b/src/cloudflare/resources/pages/projects/deployments/deployments.py
@@ -7,14 +7,6 @@
 
 import httpx
 
-from .history import (
-    HistoryResource,
-    AsyncHistoryResource,
-    HistoryResourceWithRawResponse,
-    AsyncHistoryResourceWithRawResponse,
-    HistoryResourceWithStreamingResponse,
-    AsyncHistoryResourceWithStreamingResponse,
-)
 from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ....._utils import (
     maybe_transform,
@@ -30,7 +22,14 @@
 )
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
-from .history.history import HistoryResource, AsyncHistoryResource
+from .history.history import (
+    HistoryResource,
+    AsyncHistoryResource,
+    HistoryResourceWithRawResponse,
+    AsyncHistoryResourceWithRawResponse,
+    HistoryResourceWithStreamingResponse,
+    AsyncHistoryResourceWithStreamingResponse,
+)
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.pages.projects import (
     deployment_list_params,
diff --git a/src/cloudflare/resources/pages/projects/projects.py b/src/cloudflare/resources/pages/projects/projects.py
index 364a429ed6b..39c21168c3d 100644
--- a/src/cloudflare/resources/pages/projects/projects.py
+++ b/src/cloudflare/resources/pages/projects/projects.py
@@ -20,14 +20,6 @@
     async_maybe_transform,
 )
 from ...._compat import cached_property
-from .deployments import (
-    DeploymentsResource,
-    AsyncDeploymentsResource,
-    DeploymentsResourceWithRawResponse,
-    AsyncDeploymentsResourceWithRawResponse,
-    DeploymentsResourceWithStreamingResponse,
-    AsyncDeploymentsResourceWithStreamingResponse,
-)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -40,7 +32,14 @@
 from ....types.pages import project_edit_params, project_create_params
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.pages.project import Project
-from .deployments.deployments import DeploymentsResource, AsyncDeploymentsResource
+from .deployments.deployments import (
+    DeploymentsResource,
+    AsyncDeploymentsResource,
+    DeploymentsResourceWithRawResponse,
+    AsyncDeploymentsResourceWithRawResponse,
+    DeploymentsResourceWithStreamingResponse,
+    AsyncDeploymentsResourceWithStreamingResponse,
+)
 from ....types.pages.deployment import Deployment
 
 __all__ = ["ProjectsResource", "AsyncProjectsResource"]
diff --git a/src/cloudflare/resources/r2/buckets/buckets.py b/src/cloudflare/resources/r2/buckets/buckets.py
index 173f59d81a8..d1556b62dd5 100644
--- a/src/cloudflare/resources/r2/buckets/buckets.py
+++ b/src/cloudflare/resources/r2/buckets/buckets.py
@@ -23,14 +23,6 @@
     SippyResourceWithStreamingResponse,
     AsyncSippyResourceWithStreamingResponse,
 )
-from .domains import (
-    DomainsResource,
-    AsyncDomainsResource,
-    DomainsResourceWithRawResponse,
-    AsyncDomainsResourceWithRawResponse,
-    DomainsResourceWithStreamingResponse,
-    AsyncDomainsResourceWithStreamingResponse,
-)
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._utils import (
     is_given,
@@ -57,9 +49,17 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from .domains.domains import DomainsResource, AsyncDomainsResource
+from .domains.domains import (
+    DomainsResource,
+    AsyncDomainsResource,
+    DomainsResourceWithRawResponse,
+    AsyncDomainsResourceWithRawResponse,
+    DomainsResourceWithStreamingResponse,
+    AsyncDomainsResourceWithStreamingResponse,
+)
 from ....types.r2.bucket import Bucket
-from .event_notifications import (
+from ....types.r2.bucket_list_response import BucketListResponse
+from .event_notifications.event_notifications import (
     EventNotificationsResource,
     AsyncEventNotificationsResource,
     EventNotificationsResourceWithRawResponse,
@@ -67,8 +67,6 @@
     EventNotificationsResourceWithStreamingResponse,
     AsyncEventNotificationsResourceWithStreamingResponse,
 )
-from ....types.r2.bucket_list_response import BucketListResponse
-from .event_notifications.event_notifications import EventNotificationsResource, AsyncEventNotificationsResource
 
 __all__ = ["BucketsResource", "AsyncBucketsResource"]
 
diff --git a/src/cloudflare/resources/r2/buckets/event_notifications/event_notifications.py b/src/cloudflare/resources/r2/buckets/event_notifications/event_notifications.py
index 50f3369612a..c154553fdaa 100644
--- a/src/cloudflare/resources/r2/buckets/event_notifications/event_notifications.py
+++ b/src/cloudflare/resources/r2/buckets/event_notifications/event_notifications.py
@@ -4,7 +4,7 @@
 
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
-from .configuration import (
+from .configuration.configuration import (
     ConfigurationResource,
     AsyncConfigurationResource,
     ConfigurationResourceWithRawResponse,
@@ -12,7 +12,6 @@
     ConfigurationResourceWithStreamingResponse,
     AsyncConfigurationResourceWithStreamingResponse,
 )
-from .configuration.configuration import ConfigurationResource, AsyncConfigurationResource
 
 __all__ = ["EventNotificationsResource", "AsyncEventNotificationsResource"]
 
diff --git a/src/cloudflare/resources/r2/r2.py b/src/cloudflare/resources/r2/r2.py
index b2ff7836954..2e19154ebd6 100644
--- a/src/cloudflare/resources/r2/r2.py
+++ b/src/cloudflare/resources/r2/r2.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .buckets import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .buckets.buckets import (
     BucketsResource,
     AsyncBucketsResource,
     BucketsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     BucketsResourceWithStreamingResponse,
     AsyncBucketsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .buckets.buckets import BucketsResource, AsyncBucketsResource
 from .temporary_credentials import (
     TemporaryCredentialsResource,
     AsyncTemporaryCredentialsResource,
diff --git a/src/cloudflare/resources/radar/ai/ai.py b/src/cloudflare/resources/radar/ai/ai.py
index 7141b99b4ee..4730a3809d5 100644
--- a/src/cloudflare/resources/radar/ai/ai.py
+++ b/src/cloudflare/resources/radar/ai/ai.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .bots import (
+from .bots.bots import (
     BotsResource,
     AsyncBotsResource,
     BotsResourceWithRawResponse,
@@ -10,7 +10,6 @@
     BotsResourceWithStreamingResponse,
     AsyncBotsResourceWithStreamingResponse,
 )
-from .bots.bots import BotsResource, AsyncBotsResource
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from .timeseries_groups import (
diff --git a/src/cloudflare/resources/radar/attacks/attacks.py b/src/cloudflare/resources/radar/attacks/attacks.py
index 60c79b813d3..e09babf13e7 100644
--- a/src/cloudflare/resources/radar/attacks/attacks.py
+++ b/src/cloudflare/resources/radar/attacks/attacks.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .layer3 import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .layer3.layer3 import (
     Layer3Resource,
     AsyncLayer3Resource,
     Layer3ResourceWithRawResponse,
@@ -10,7 +12,7 @@
     Layer3ResourceWithStreamingResponse,
     AsyncLayer3ResourceWithStreamingResponse,
 )
-from .layer7 import (
+from .layer7.layer7 import (
     Layer7Resource,
     AsyncLayer7Resource,
     Layer7ResourceWithRawResponse,
@@ -18,10 +20,6 @@
     Layer7ResourceWithStreamingResponse,
     AsyncLayer7ResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .layer3.layer3 import Layer3Resource, AsyncLayer3Resource
-from .layer7.layer7 import Layer7Resource, AsyncLayer7Resource
 
 __all__ = ["AttacksResource", "AsyncAttacksResource"]
 
diff --git a/src/cloudflare/resources/radar/attacks/layer3/layer3.py b/src/cloudflare/resources/radar/attacks/layer3/layer3.py
index 94634f57054..695170a13c7 100644
--- a/src/cloudflare/resources/radar/attacks/layer3/layer3.py
+++ b/src/cloudflare/resources/radar/attacks/layer3/layer3.py
@@ -8,14 +8,6 @@
 
 import httpx
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -24,7 +16,14 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
 from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ....._utils import (
     maybe_transform,
diff --git a/src/cloudflare/resources/radar/attacks/layer7/layer7.py b/src/cloudflare/resources/radar/attacks/layer7/layer7.py
index 8d27ce12455..d1e229e8bdf 100644
--- a/src/cloudflare/resources/radar/attacks/layer7/layer7.py
+++ b/src/cloudflare/resources/radar/attacks/layer7/layer7.py
@@ -8,14 +8,6 @@
 
 import httpx
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -24,7 +16,14 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
 from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ....._utils import (
     maybe_transform,
diff --git a/src/cloudflare/resources/radar/bgp/bgp.py b/src/cloudflare/resources/radar/bgp/bgp.py
index e2d8967d05f..69235eb71f3 100644
--- a/src/cloudflare/resources/radar/bgp/bgp.py
+++ b/src/cloudflare/resources/radar/bgp/bgp.py
@@ -16,22 +16,6 @@
     IPsResourceWithStreamingResponse,
     AsyncIPsResourceWithStreamingResponse,
 )
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
-from .leaks import (
-    LeaksResource,
-    AsyncLeaksResource,
-    LeaksResourceWithRawResponse,
-    AsyncLeaksResourceWithRawResponse,
-    LeaksResourceWithStreamingResponse,
-    AsyncLeaksResourceWithStreamingResponse,
-)
 from .routes import (
     RoutesResource,
     AsyncRoutesResource,
@@ -40,22 +24,28 @@
     RoutesResourceWithStreamingResponse,
     AsyncRoutesResourceWithStreamingResponse,
 )
-from .hijacks import (
-    HijacksResource,
-    AsyncHijacksResource,
-    HijacksResourceWithRawResponse,
-    AsyncHijacksResourceWithRawResponse,
-    HijacksResourceWithStreamingResponse,
-    AsyncHijacksResourceWithStreamingResponse,
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._utils import (
     maybe_transform,
     async_maybe_transform,
 )
 from ...._compat import cached_property
-from .leaks.leaks import LeaksResource, AsyncLeaksResource
+from .leaks.leaks import (
+    LeaksResource,
+    AsyncLeaksResource,
+    LeaksResourceWithRawResponse,
+    AsyncLeaksResourceWithRawResponse,
+    LeaksResourceWithStreamingResponse,
+    AsyncLeaksResourceWithStreamingResponse,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -66,7 +56,14 @@
 from ...._wrappers import ResultWrapper
 from ....types.radar import bgp_timeseries_params
 from ...._base_client import make_request_options
-from .hijacks.hijacks import HijacksResource, AsyncHijacksResource
+from .hijacks.hijacks import (
+    HijacksResource,
+    AsyncHijacksResource,
+    HijacksResourceWithRawResponse,
+    AsyncHijacksResourceWithRawResponse,
+    HijacksResourceWithStreamingResponse,
+    AsyncHijacksResourceWithStreamingResponse,
+)
 from ....types.radar.bgp_timeseries_response import BGPTimeseriesResponse
 
 __all__ = ["BGPResource", "AsyncBGPResource"]
diff --git a/src/cloudflare/resources/radar/email/email.py b/src/cloudflare/resources/radar/email/email.py
index 66a9392e7fa..ecc4d0c11f8 100644
--- a/src/cloudflare/resources/radar/email/email.py
+++ b/src/cloudflare/resources/radar/email/email.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .routing import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .routing.routing import (
     RoutingResource,
     AsyncRoutingResource,
     RoutingResourceWithRawResponse,
@@ -10,7 +12,7 @@
     RoutingResourceWithStreamingResponse,
     AsyncRoutingResourceWithStreamingResponse,
 )
-from .security import (
+from .security.security import (
     SecurityResource,
     AsyncSecurityResource,
     SecurityResourceWithRawResponse,
@@ -18,10 +20,6 @@
     SecurityResourceWithStreamingResponse,
     AsyncSecurityResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .routing.routing import RoutingResource, AsyncRoutingResource
-from .security.security import SecurityResource, AsyncSecurityResource
 
 __all__ = ["EmailResource", "AsyncEmailResource"]
 
diff --git a/src/cloudflare/resources/radar/email/security/security.py b/src/cloudflare/resources/radar/email/security/security.py
index c0cce5a0312..c9446c10867 100644
--- a/src/cloudflare/resources/radar/email/security/security.py
+++ b/src/cloudflare/resources/radar/email/security/security.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .top import (
-    TopResource,
-    AsyncTopResource,
-    TopResourceWithRawResponse,
-    AsyncTopResourceWithRawResponse,
-    TopResourceWithStreamingResponse,
-    AsyncTopResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -18,7 +10,14 @@
     SummaryResourceWithStreamingResponse,
     AsyncSummaryResourceWithStreamingResponse,
 )
-from .top.top import TopResource, AsyncTopResource
+from .top.top import (
+    TopResource,
+    AsyncTopResource,
+    TopResourceWithRawResponse,
+    AsyncTopResourceWithRawResponse,
+    TopResourceWithStreamingResponse,
+    AsyncTopResourceWithStreamingResponse,
+)
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from .timeseries_groups import (
diff --git a/src/cloudflare/resources/radar/email/security/top/top.py b/src/cloudflare/resources/radar/email/security/top/top.py
index 390e6db625d..ed40869000e 100644
--- a/src/cloudflare/resources/radar/email/security/top/top.py
+++ b/src/cloudflare/resources/radar/email/security/top/top.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .tlds import (
+from .tlds.tlds import (
     TldsResource,
     AsyncTldsResource,
     TldsResourceWithRawResponse,
@@ -10,7 +10,6 @@
     TldsResourceWithStreamingResponse,
     AsyncTldsResourceWithStreamingResponse,
 )
-from .tlds.tlds import TldsResource, AsyncTldsResource
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 
diff --git a/src/cloudflare/resources/radar/http/http.py b/src/cloudflare/resources/radar/http/http.py
index cdad5394061..bd316f3d341 100644
--- a/src/cloudflare/resources/radar/http/http.py
+++ b/src/cloudflare/resources/radar/http/http.py
@@ -16,14 +16,6 @@
     TopResourceWithStreamingResponse,
     AsyncTopResourceWithStreamingResponse,
 )
-from .ases import (
-    AsesResource,
-    AsyncAsesResource,
-    AsesResourceWithRawResponse,
-    AsyncAsesResourceWithRawResponse,
-    AsesResourceWithStreamingResponse,
-    AsyncAsesResourceWithStreamingResponse,
-)
 from .summary import (
     SummaryResource,
     AsyncSummaryResource,
@@ -37,14 +29,13 @@
     maybe_transform,
     async_maybe_transform,
 )
-from .ases.ases import AsesResource, AsyncAsesResource
-from .locations import (
-    LocationsResource,
-    AsyncLocationsResource,
-    LocationsResourceWithRawResponse,
-    AsyncLocationsResourceWithRawResponse,
-    LocationsResourceWithStreamingResponse,
-    AsyncLocationsResourceWithStreamingResponse,
+from .ases.ases import (
+    AsesResource,
+    AsyncAsesResource,
+    AsesResourceWithRawResponse,
+    AsyncAsesResourceWithRawResponse,
+    AsesResourceWithStreamingResponse,
+    AsyncAsesResourceWithStreamingResponse,
 )
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -65,7 +56,14 @@
     TimeseriesGroupsResourceWithStreamingResponse,
     AsyncTimeseriesGroupsResourceWithStreamingResponse,
 )
-from .locations.locations import LocationsResource, AsyncLocationsResource
+from .locations.locations import (
+    LocationsResource,
+    AsyncLocationsResource,
+    LocationsResourceWithRawResponse,
+    AsyncLocationsResourceWithRawResponse,
+    LocationsResourceWithStreamingResponse,
+    AsyncLocationsResourceWithStreamingResponse,
+)
 from ....types.radar.http_timeseries_response import HTTPTimeseriesResponse
 
 __all__ = ["HTTPResource", "AsyncHTTPResource"]
diff --git a/src/cloudflare/resources/radar/quality/quality.py b/src/cloudflare/resources/radar/quality/quality.py
index 07daf144a9b..d4569e2e07d 100644
--- a/src/cloudflare/resources/radar/quality/quality.py
+++ b/src/cloudflare/resources/radar/quality/quality.py
@@ -10,7 +10,8 @@
     IQIResourceWithStreamingResponse,
     AsyncIQIResourceWithStreamingResponse,
 )
-from .speed import (
+from ...._compat import cached_property
+from .speed.speed import (
     SpeedResource,
     AsyncSpeedResource,
     SpeedResourceWithRawResponse,
@@ -18,8 +19,6 @@
     SpeedResourceWithStreamingResponse,
     AsyncSpeedResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .speed.speed import SpeedResource, AsyncSpeedResource
 from ...._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["QualityResource", "AsyncQualityResource"]
diff --git a/src/cloudflare/resources/radar/radar.py b/src/cloudflare/resources/radar/radar.py
index e19b6c6a06a..35fa81d3b5a 100644
--- a/src/cloudflare/resources/radar/radar.py
+++ b/src/cloudflare/resources/radar/radar.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .ai import (
+from .ai.ai import (
     AIResource,
     AsyncAIResource,
     AIResourceWithRawResponse,
@@ -10,7 +10,15 @@
     AIResourceWithStreamingResponse,
     AsyncAIResourceWithStreamingResponse,
 )
-from .bgp import (
+from .search import (
+    SearchResource,
+    AsyncSearchResource,
+    SearchResourceWithRawResponse,
+    AsyncSearchResourceWithRawResponse,
+    SearchResourceWithStreamingResponse,
+    AsyncSearchResourceWithStreamingResponse,
+)
+from .bgp.bgp import (
     BGPResource,
     AsyncBGPResource,
     BGPResourceWithRawResponse,
@@ -18,7 +26,7 @@
     BGPResourceWithStreamingResponse,
     AsyncBGPResourceWithStreamingResponse,
 )
-from .dns import (
+from .dns.dns import (
     DNSResource,
     AsyncDNSResource,
     DNSResourceWithRawResponse,
@@ -26,7 +34,16 @@
     DNSResourceWithStreamingResponse,
     AsyncDNSResourceWithStreamingResponse,
 )
-from .http import (
+from .datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from ..._compat import cached_property
+from .http.http import (
     HTTPResource,
     AsyncHTTPResource,
     HTTPResourceWithRawResponse,
@@ -34,8 +51,8 @@
     HTTPResourceWithStreamingResponse,
     AsyncHTTPResourceWithStreamingResponse,
 )
-from .ai.ai import AIResource, AsyncAIResource
-from .as112 import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .as112.as112 import (
     AS112Resource,
     AsyncAS112Resource,
     AS112ResourceWithRawResponse,
@@ -43,7 +60,7 @@
     AS112ResourceWithStreamingResponse,
     AsyncAS112ResourceWithStreamingResponse,
 )
-from .email import (
+from .email.email import (
     EmailResource,
     AsyncEmailResource,
     EmailResourceWithRawResponse,
@@ -51,15 +68,7 @@
     EmailResourceWithStreamingResponse,
     AsyncEmailResourceWithStreamingResponse,
 )
-from .search import (
-    SearchResource,
-    AsyncSearchResource,
-    SearchResourceWithRawResponse,
-    AsyncSearchResourceWithRawResponse,
-    SearchResourceWithStreamingResponse,
-    AsyncSearchResourceWithStreamingResponse,
-)
-from .attacks import (
+from .attacks.attacks import (
     AttacksResource,
     AsyncAttacksResource,
     AttacksResourceWithRawResponse,
@@ -67,9 +76,7 @@
     AttacksResourceWithStreamingResponse,
     AsyncAttacksResourceWithStreamingResponse,
 )
-from .bgp.bgp import BGPResource, AsyncBGPResource
-from .dns.dns import DNSResource, AsyncDNSResource
-from .quality import (
+from .quality.quality import (
     QualityResource,
     AsyncQualityResource,
     QualityResourceWithRawResponse,
@@ -77,7 +84,7 @@
     QualityResourceWithStreamingResponse,
     AsyncQualityResourceWithStreamingResponse,
 )
-from .ranking import (
+from .ranking.ranking import (
     RankingResource,
     AsyncRankingResource,
     RankingResourceWithRawResponse,
@@ -85,15 +92,7 @@
     RankingResourceWithStreamingResponse,
     AsyncRankingResourceWithStreamingResponse,
 )
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
-)
-from .entities import (
+from .entities.entities import (
     EntitiesResource,
     AsyncEntitiesResource,
     EntitiesResourceWithRawResponse,
@@ -101,7 +100,7 @@
     EntitiesResourceWithStreamingResponse,
     AsyncEntitiesResourceWithStreamingResponse,
 )
-from .netflows import (
+from .netflows.netflows import (
     NetflowsResource,
     AsyncNetflowsResource,
     NetflowsResourceWithRawResponse,
@@ -109,10 +108,15 @@
     NetflowsResourceWithStreamingResponse,
     AsyncNetflowsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .http.http import HTTPResource, AsyncHTTPResource
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .annotations import (
+from .tcp_resets_timeouts import (
+    TCPResetsTimeoutsResource,
+    AsyncTCPResetsTimeoutsResource,
+    TCPResetsTimeoutsResourceWithRawResponse,
+    AsyncTCPResetsTimeoutsResourceWithRawResponse,
+    TCPResetsTimeoutsResourceWithStreamingResponse,
+    AsyncTCPResetsTimeoutsResourceWithStreamingResponse,
+)
+from .annotations.annotations import (
     AnnotationsResource,
     AsyncAnnotationsResource,
     AnnotationsResourceWithRawResponse,
@@ -120,9 +124,7 @@
     AnnotationsResourceWithStreamingResponse,
     AsyncAnnotationsResourceWithStreamingResponse,
 )
-from .as112.as112 import AS112Resource, AsyncAS112Resource
-from .email.email import EmailResource, AsyncEmailResource
-from .verified_bots import (
+from .verified_bots.verified_bots import (
     VerifiedBotsResource,
     AsyncVerifiedBotsResource,
     VerifiedBotsResourceWithRawResponse,
@@ -130,12 +132,7 @@
     VerifiedBotsResourceWithStreamingResponse,
     AsyncVerifiedBotsResourceWithStreamingResponse,
 )
-from .attacks.attacks import AttacksResource, AsyncAttacksResource
-from .quality.quality import QualityResource, AsyncQualityResource
-from .ranking.ranking import RankingResource, AsyncRankingResource
-from .entities.entities import EntitiesResource, AsyncEntitiesResource
-from .netflows.netflows import NetflowsResource, AsyncNetflowsResource
-from .traffic_anomalies import (
+from .traffic_anomalies.traffic_anomalies import (
     TrafficAnomaliesResource,
     AsyncTrafficAnomaliesResource,
     TrafficAnomaliesResourceWithRawResponse,
@@ -143,17 +140,6 @@
     TrafficAnomaliesResourceWithStreamingResponse,
     AsyncTrafficAnomaliesResourceWithStreamingResponse,
 )
-from .tcp_resets_timeouts import (
-    TCPResetsTimeoutsResource,
-    AsyncTCPResetsTimeoutsResource,
-    TCPResetsTimeoutsResourceWithRawResponse,
-    AsyncTCPResetsTimeoutsResourceWithRawResponse,
-    TCPResetsTimeoutsResourceWithStreamingResponse,
-    AsyncTCPResetsTimeoutsResourceWithStreamingResponse,
-)
-from .annotations.annotations import AnnotationsResource, AsyncAnnotationsResource
-from .verified_bots.verified_bots import VerifiedBotsResource, AsyncVerifiedBotsResource
-from .traffic_anomalies.traffic_anomalies import TrafficAnomaliesResource, AsyncTrafficAnomaliesResource
 
 __all__ = ["RadarResource", "AsyncRadarResource"]
 
diff --git a/src/cloudflare/resources/rules/rules.py b/src/cloudflare/resources/rules/rules.py
index 68f92fb8365..327dac15b0a 100644
--- a/src/cloudflare/resources/rules/rules.py
+++ b/src/cloudflare/resources/rules/rules.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .lists import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .lists.lists import (
     ListsResource,
     AsyncListsResource,
     ListsResourceWithRawResponse,
@@ -10,9 +12,6 @@
     ListsResourceWithStreamingResponse,
     AsyncListsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .lists.lists import ListsResource, AsyncListsResource
 
 __all__ = ["RulesResource", "AsyncRulesResource"]
 
diff --git a/src/cloudflare/resources/rulesets/rulesets.py b/src/cloudflare/resources/rulesets/rulesets.py
index ab563958453..d7bdec60504 100644
--- a/src/cloudflare/resources/rulesets/rulesets.py
+++ b/src/cloudflare/resources/rulesets/rulesets.py
@@ -14,14 +14,6 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .phases import (
-    PhasesResource,
-    AsyncPhasesResource,
-    PhasesResourceWithRawResponse,
-    AsyncPhasesResourceWithRawResponse,
-    PhasesResourceWithStreamingResponse,
-    AsyncPhasesResourceWithStreamingResponse,
-)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -45,7 +37,14 @@
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
-from .phases.phases import PhasesResource, AsyncPhasesResource
+from .phases.phases import (
+    PhasesResource,
+    AsyncPhasesResource,
+    PhasesResourceWithRawResponse,
+    AsyncPhasesResourceWithRawResponse,
+    PhasesResourceWithStreamingResponse,
+    AsyncPhasesResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.rulesets import Kind, Phase, ruleset_create_params, ruleset_update_params
 from ...types.rulesets.kind import Kind
diff --git a/src/cloudflare/resources/spectrum/analytics/analytics.py b/src/cloudflare/resources/spectrum/analytics/analytics.py
index def8f2116aa..92fead88a80 100644
--- a/src/cloudflare/resources/spectrum/analytics/analytics.py
+++ b/src/cloudflare/resources/spectrum/analytics/analytics.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .events import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .events.events import (
     EventsResource,
     AsyncEventsResource,
     EventsResourceWithRawResponse,
@@ -10,8 +12,7 @@
     EventsResourceWithStreamingResponse,
     AsyncEventsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .aggregates import (
+from .aggregates.aggregates import (
     AggregatesResource,
     AsyncAggregatesResource,
     AggregatesResourceWithRawResponse,
@@ -19,9 +20,6 @@
     AggregatesResourceWithStreamingResponse,
     AsyncAggregatesResourceWithStreamingResponse,
 )
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .events.events import EventsResource, AsyncEventsResource
-from .aggregates.aggregates import AggregatesResource, AsyncAggregatesResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 
diff --git a/src/cloudflare/resources/spectrum/spectrum.py b/src/cloudflare/resources/spectrum/spectrum.py
index 405e9040721..1d434fa8172 100644
--- a/src/cloudflare/resources/spectrum/spectrum.py
+++ b/src/cloudflare/resources/spectrum/spectrum.py
@@ -11,7 +11,8 @@
     AsyncAppsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .analytics import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .analytics.analytics import (
     AnalyticsResource,
     AsyncAnalyticsResource,
     AnalyticsResourceWithRawResponse,
@@ -19,8 +20,6 @@
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
 
 __all__ = ["SpectrumResource", "AsyncSpectrumResource"]
 
diff --git a/src/cloudflare/resources/speed/speed.py b/src/cloudflare/resources/speed/speed.py
index 516e3e87980..5ef84fb95fe 100644
--- a/src/cloudflare/resources/speed/speed.py
+++ b/src/cloudflare/resources/speed/speed.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .pages import (
-    PagesResource,
-    AsyncPagesResource,
-    PagesResourceWithRawResponse,
-    AsyncPagesResourceWithRawResponse,
-    PagesResourceWithStreamingResponse,
-    AsyncPagesResourceWithStreamingResponse,
-)
 from .schedule import (
     ScheduleResource,
     AsyncScheduleResource,
@@ -20,7 +12,14 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .pages.pages import PagesResource, AsyncPagesResource
+from .pages.pages import (
+    PagesResource,
+    AsyncPagesResource,
+    PagesResourceWithRawResponse,
+    AsyncPagesResourceWithRawResponse,
+    PagesResourceWithStreamingResponse,
+    AsyncPagesResourceWithStreamingResponse,
+)
 from .availabilities import (
     AvailabilitiesResource,
     AsyncAvailabilitiesResource,
diff --git a/src/cloudflare/resources/ssl/ssl.py b/src/cloudflare/resources/ssl/ssl.py
index 8e8a7b54c88..c0e4299285b 100644
--- a/src/cloudflare/resources/ssl/ssl.py
+++ b/src/cloudflare/resources/ssl/ssl.py
@@ -11,14 +11,6 @@
     AsyncAnalyzeResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .universal import (
-    UniversalResource,
-    AsyncUniversalResource,
-    UniversalResourceWithRawResponse,
-    AsyncUniversalResourceWithRawResponse,
-    UniversalResourceWithStreamingResponse,
-    AsyncUniversalResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from .verification import (
     VerificationResource,
@@ -36,7 +28,15 @@
     RecommendationsResourceWithStreamingResponse,
     AsyncRecommendationsResourceWithStreamingResponse,
 )
-from .certificate_packs import (
+from .universal.universal import (
+    UniversalResource,
+    AsyncUniversalResource,
+    UniversalResourceWithRawResponse,
+    AsyncUniversalResourceWithRawResponse,
+    UniversalResourceWithStreamingResponse,
+    AsyncUniversalResourceWithStreamingResponse,
+)
+from .certificate_packs.certificate_packs import (
     CertificatePacksResource,
     AsyncCertificatePacksResource,
     CertificatePacksResourceWithRawResponse,
@@ -44,8 +44,6 @@
     CertificatePacksResourceWithStreamingResponse,
     AsyncCertificatePacksResourceWithStreamingResponse,
 )
-from .universal.universal import UniversalResource, AsyncUniversalResource
-from .certificate_packs.certificate_packs import CertificatePacksResource, AsyncCertificatePacksResource
 
 __all__ = ["SSLResource", "AsyncSSLResource"]
 
diff --git a/src/cloudflare/resources/stream/captions/captions.py b/src/cloudflare/resources/stream/captions/captions.py
index 8b4db2d91bc..d79e258babd 100644
--- a/src/cloudflare/resources/stream/captions/captions.py
+++ b/src/cloudflare/resources/stream/captions/captions.py
@@ -6,14 +6,6 @@
 
 import httpx
 
-from .language import (
-    LanguageResource,
-    AsyncLanguageResource,
-    LanguageResourceWithRawResponse,
-    AsyncLanguageResourceWithRawResponse,
-    LanguageResourceWithStreamingResponse,
-    AsyncLanguageResourceWithStreamingResponse,
-)
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -25,7 +17,14 @@
 )
 from ...._wrappers import ResultWrapper
 from ...._base_client import make_request_options
-from .language.language import LanguageResource, AsyncLanguageResource
+from .language.language import (
+    LanguageResource,
+    AsyncLanguageResource,
+    LanguageResourceWithRawResponse,
+    AsyncLanguageResourceWithRawResponse,
+    LanguageResourceWithStreamingResponse,
+    AsyncLanguageResourceWithStreamingResponse,
+)
 from ....types.stream.caption_get_response import CaptionGetResponse
 
 __all__ = ["CaptionsResource", "AsyncCaptionsResource"]
diff --git a/src/cloudflare/resources/stream/stream.py b/src/cloudflare/resources/stream/stream.py
index acac5726a6b..379ffd55eb1 100644
--- a/src/cloudflare/resources/stream/stream.py
+++ b/src/cloudflare/resources/stream/stream.py
@@ -62,14 +62,6 @@
     strip_not_given,
     async_maybe_transform,
 )
-from .captions import (
-    CaptionsResource,
-    AsyncCaptionsResource,
-    CaptionsResourceWithRawResponse,
-    AsyncCaptionsResourceWithRawResponse,
-    CaptionsResourceWithStreamingResponse,
-    AsyncCaptionsResourceWithStreamingResponse,
-)
 from .webhooks import (
     WebhooksResource,
     AsyncWebhooksResource,
@@ -103,14 +95,6 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .live_inputs import (
-    LiveInputsResource,
-    AsyncLiveInputsResource,
-    LiveInputsResourceWithRawResponse,
-    AsyncLiveInputsResourceWithRawResponse,
-    LiveInputsResourceWithStreamingResponse,
-    AsyncLiveInputsResourceWithStreamingResponse,
-)
 from ...pagination import SyncSinglePage, AsyncSinglePage
 from .audio_tracks import (
     AudioTracksResource,
@@ -130,9 +114,23 @@
 )
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.stream import stream_edit_params, stream_list_params, stream_create_params
-from .captions.captions import CaptionsResource, AsyncCaptionsResource
+from .captions.captions import (
+    CaptionsResource,
+    AsyncCaptionsResource,
+    CaptionsResourceWithRawResponse,
+    AsyncCaptionsResourceWithRawResponse,
+    CaptionsResourceWithStreamingResponse,
+    AsyncCaptionsResourceWithStreamingResponse,
+)
 from ...types.stream.video import Video
-from .live_inputs.live_inputs import LiveInputsResource, AsyncLiveInputsResource
+from .live_inputs.live_inputs import (
+    LiveInputsResource,
+    AsyncLiveInputsResource,
+    LiveInputsResourceWithRawResponse,
+    AsyncLiveInputsResourceWithRawResponse,
+    LiveInputsResourceWithStreamingResponse,
+    AsyncLiveInputsResourceWithStreamingResponse,
+)
 from ...types.stream.allowed_origins import AllowedOrigins
 
 __all__ = ["StreamResource", "AsyncStreamResource"]
diff --git a/src/cloudflare/resources/user/user.py b/src/cloudflare/resources/user/user.py
index 6cbff3b21d7..5680184c284 100644
--- a/src/cloudflare/resources/user/user.py
+++ b/src/cloudflare/resources/user/user.py
@@ -6,22 +6,6 @@
 
 import httpx
 
-from .tokens import (
-    TokensResource,
-    AsyncTokensResource,
-    TokensResourceWithRawResponse,
-    AsyncTokensResourceWithRawResponse,
-    TokensResourceWithStreamingResponse,
-    AsyncTokensResourceWithStreamingResponse,
-)
-from .billing import (
-    BillingResource,
-    AsyncBillingResource,
-    BillingResourceWithRawResponse,
-    AsyncBillingResourceWithRawResponse,
-    BillingResourceWithStreamingResponse,
-    AsyncBillingResourceWithStreamingResponse,
-)
 from .invites import (
     InvitesResource,
     AsyncInvitesResource,
@@ -69,9 +53,23 @@
     SubscriptionsResourceWithStreamingResponse,
     AsyncSubscriptionsResourceWithStreamingResponse,
 )
-from .tokens.tokens import TokensResource, AsyncTokensResource
+from .tokens.tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
-from .billing.billing import BillingResource, AsyncBillingResource
+from .billing.billing import (
+    BillingResource,
+    AsyncBillingResource,
+    BillingResourceWithRawResponse,
+    AsyncBillingResourceWithRawResponse,
+    BillingResourceWithStreamingResponse,
+    AsyncBillingResourceWithStreamingResponse,
+)
 
 __all__ = ["UserResource", "AsyncUserResource"]
 
diff --git a/src/cloudflare/resources/vectorize/vectorize.py b/src/cloudflare/resources/vectorize/vectorize.py
index 19a8d8e4c8d..dd2961b7b7c 100644
--- a/src/cloudflare/resources/vectorize/vectorize.py
+++ b/src/cloudflare/resources/vectorize/vectorize.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .indexes import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .indexes.indexes import (
     IndexesResource,
     AsyncIndexesResource,
     IndexesResourceWithRawResponse,
@@ -10,9 +12,6 @@
     IndexesResourceWithStreamingResponse,
     AsyncIndexesResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .indexes.indexes import IndexesResource, AsyncIndexesResource
 
 __all__ = ["VectorizeResource", "AsyncVectorizeResource"]
 
diff --git a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
index 8196ce06691..a7a4308e856 100644
--- a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
+++ b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
@@ -23,14 +23,6 @@
     RulesResourceWithStreamingResponse,
     AsyncRulesResourceWithStreamingResponse,
 )
-from .events import (
-    EventsResource,
-    AsyncEventsResource,
-    EventsResourceWithRawResponse,
-    AsyncEventsResourceWithRawResponse,
-    EventsResourceWithStreamingResponse,
-    AsyncEventsResourceWithStreamingResponse,
-)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -62,7 +54,14 @@
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from .events.events import EventsResource, AsyncEventsResource
+from .events.events import (
+    EventsResource,
+    AsyncEventsResource,
+    EventsResourceWithRawResponse,
+    AsyncEventsResourceWithRawResponse,
+    EventsResourceWithStreamingResponse,
+    AsyncEventsResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.waiting_rooms import (
     waiting_room_edit_params,
diff --git a/src/cloudflare/resources/web3/hostnames/hostnames.py b/src/cloudflare/resources/web3/hostnames/hostnames.py
index 675d703dd44..58357a662aa 100644
--- a/src/cloudflare/resources/web3/hostnames/hostnames.py
+++ b/src/cloudflare/resources/web3/hostnames/hostnames.py
@@ -24,7 +24,9 @@
 from ....pagination import SyncSinglePage, AsyncSinglePage
 from ....types.web3 import hostname_edit_params, hostname_create_params
 from ...._base_client import AsyncPaginator, make_request_options
-from .ipfs_universal_paths import (
+from ....types.web3.hostname import Hostname
+from ....types.web3.hostname_delete_response import HostnameDeleteResponse
+from .ipfs_universal_paths.ipfs_universal_paths import (
     IPFSUniversalPathsResource,
     AsyncIPFSUniversalPathsResource,
     IPFSUniversalPathsResourceWithRawResponse,
@@ -32,9 +34,6 @@
     IPFSUniversalPathsResourceWithStreamingResponse,
     AsyncIPFSUniversalPathsResourceWithStreamingResponse,
 )
-from ....types.web3.hostname import Hostname
-from ....types.web3.hostname_delete_response import HostnameDeleteResponse
-from .ipfs_universal_paths.ipfs_universal_paths import IPFSUniversalPathsResource, AsyncIPFSUniversalPathsResource
 
 __all__ = ["HostnamesResource", "AsyncHostnamesResource"]
 
diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
index 8f85ee09f93..be95236abf9 100644
--- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
+++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/ipfs_universal_paths.py
@@ -4,7 +4,7 @@
 
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
-from .content_lists import (
+from .content_lists.content_lists import (
     ContentListsResource,
     AsyncContentListsResource,
     ContentListsResourceWithRawResponse,
@@ -12,7 +12,6 @@
     ContentListsResourceWithStreamingResponse,
     AsyncContentListsResourceWithStreamingResponse,
 )
-from .content_lists.content_lists import ContentListsResource, AsyncContentListsResource
 
 __all__ = ["IPFSUniversalPathsResource", "AsyncIPFSUniversalPathsResource"]
 
diff --git a/src/cloudflare/resources/web3/web3.py b/src/cloudflare/resources/web3/web3.py
index 207a8568d8a..0e432afac3e 100644
--- a/src/cloudflare/resources/web3/web3.py
+++ b/src/cloudflare/resources/web3/web3.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ..._compat import cached_property
-from .hostnames import (
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .hostnames.hostnames import (
     HostnamesResource,
     AsyncHostnamesResource,
     HostnamesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     HostnamesResourceWithStreamingResponse,
     AsyncHostnamesResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .hostnames.hostnames import HostnamesResource, AsyncHostnamesResource
 
 __all__ = ["Web3Resource", "AsyncWeb3Resource"]
 
diff --git a/src/cloudflare/resources/workers/scripts/scripts.py b/src/cloudflare/resources/workers/scripts/scripts.py
index cc26533caa0..ffc9db763a4 100644
--- a/src/cloudflare/resources/workers/scripts/scripts.py
+++ b/src/cloudflare/resources/workers/scripts/scripts.py
@@ -15,14 +15,6 @@
     TailResourceWithStreamingResponse,
     AsyncTailResourceWithStreamingResponse,
 )
-from .assets import (
-    AssetsResource,
-    AsyncAssetsResource,
-    AssetsResourceWithRawResponse,
-    AsyncAssetsResourceWithRawResponse,
-    AssetsResourceWithStreamingResponse,
-    AsyncAssetsResourceWithStreamingResponse,
-)
 from .content import (
     ContentResource,
     AsyncContentResource,
@@ -95,7 +87,14 @@
 )
 from ...._wrappers import ResultWrapper
 from ....pagination import SyncSinglePage, AsyncSinglePage
-from .assets.assets import AssetsResource, AsyncAssetsResource
+from .assets.assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.workers import script_delete_params, script_update_params
 from ....types.workers.script import Script
diff --git a/src/cloudflare/resources/workers/workers.py b/src/cloudflare/resources/workers/workers.py
index fd6f5e6961a..57911025f5f 100644
--- a/src/cloudflare/resources/workers/workers.py
+++ b/src/cloudflare/resources/workers/workers.py
@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .assets import (
-    AssetsResource,
-    AsyncAssetsResource,
-    AssetsResourceWithRawResponse,
-    AsyncAssetsResourceWithRawResponse,
-    AssetsResourceWithStreamingResponse,
-    AsyncAssetsResourceWithStreamingResponse,
-)
 from .domains import (
     DomainsResource,
     AsyncDomainsResource,
@@ -18,14 +10,6 @@
     DomainsResourceWithStreamingResponse,
     AsyncDomainsResourceWithStreamingResponse,
 )
-from .scripts import (
-    ScriptsResource,
-    AsyncScriptsResource,
-    ScriptsResourceWithRawResponse,
-    AsyncScriptsResourceWithRawResponse,
-    ScriptsResourceWithStreamingResponse,
-    AsyncScriptsResourceWithStreamingResponse,
-)
 from ..._compat import cached_property
 from .subdomains import (
     SubdomainsResource,
@@ -36,8 +20,22 @@
     AsyncSubdomainsResourceWithStreamingResponse,
 )
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .assets.assets import AssetsResource, AsyncAssetsResource
-from .scripts.scripts import ScriptsResource, AsyncScriptsResource
+from .assets.assets import (
+    AssetsResource,
+    AsyncAssetsResource,
+    AssetsResourceWithRawResponse,
+    AsyncAssetsResourceWithRawResponse,
+    AssetsResourceWithStreamingResponse,
+    AsyncAssetsResourceWithStreamingResponse,
+)
+from .scripts.scripts import (
+    ScriptsResource,
+    AsyncScriptsResource,
+    ScriptsResourceWithRawResponse,
+    AsyncScriptsResourceWithRawResponse,
+    ScriptsResourceWithStreamingResponse,
+    AsyncScriptsResourceWithStreamingResponse,
+)
 from .account_settings import (
     AccountSettingsResource,
     AsyncAccountSettingsResource,
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py b/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
index c96b5ffb005..2d14a862986 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/dispatch.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from ...._compat import cached_property
-from .namespaces import (
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .namespaces.namespaces import (
     NamespacesResource,
     AsyncNamespacesResource,
     NamespacesResourceWithRawResponse,
@@ -11,8 +12,6 @@
     NamespacesResourceWithStreamingResponse,
     AsyncNamespacesResourceWithStreamingResponse,
 )
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .namespaces.namespaces import NamespacesResource, AsyncNamespacesResource
 
 __all__ = ["DispatchResource", "AsyncDispatchResource"]
 
diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
index 701604af457..00db79b99cc 100644
--- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
+++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py
@@ -6,14 +6,6 @@
 
 import httpx
 
-from .scripts import (
-    ScriptsResource,
-    AsyncScriptsResource,
-    ScriptsResourceWithRawResponse,
-    AsyncScriptsResourceWithRawResponse,
-    ScriptsResourceWithStreamingResponse,
-    AsyncScriptsResourceWithStreamingResponse,
-)
 from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ....._utils import (
     maybe_transform,
@@ -29,7 +21,14 @@
 )
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
-from .scripts.scripts import ScriptsResource, AsyncScriptsResource
+from .scripts.scripts import (
+    ScriptsResource,
+    AsyncScriptsResource,
+    ScriptsResourceWithRawResponse,
+    AsyncScriptsResourceWithRawResponse,
+    ScriptsResourceWithStreamingResponse,
+    AsyncScriptsResourceWithStreamingResponse,
+)
 from ....._base_client import AsyncPaginator, make_request_options
 from .....types.workers_for_platforms.dispatch import namespace_create_params
 from .....types.workers_for_platforms.dispatch.namespace_get_response import NamespaceGetResponse
diff --git a/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py b/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
index dc4de2fd497..ae9cfa96347 100644
--- a/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
+++ b/src/cloudflare/resources/workers_for_platforms/workers_for_platforms.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .dispatch import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .dispatch.dispatch import (
     DispatchResource,
     AsyncDispatchResource,
     DispatchResourceWithRawResponse,
@@ -10,9 +12,6 @@
     DispatchResourceWithStreamingResponse,
     AsyncDispatchResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .dispatch.dispatch import DispatchResource, AsyncDispatchResource
 
 __all__ = ["WorkersForPlatformsResource", "AsyncWorkersForPlatformsResource"]
 
diff --git a/src/cloudflare/resources/workflows/workflows.py b/src/cloudflare/resources/workflows/workflows.py
index 2dc98b1a542..695999d5f25 100644
--- a/src/cloudflare/resources/workflows/workflows.py
+++ b/src/cloudflare/resources/workflows/workflows.py
@@ -20,14 +20,6 @@
     AsyncVersionsResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
-from .instances import (
-    InstancesResource,
-    AsyncInstancesResource,
-    InstancesResourceWithRawResponse,
-    AsyncInstancesResourceWithRawResponse,
-    InstancesResourceWithStreamingResponse,
-    AsyncInstancesResourceWithStreamingResponse,
-)
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
     to_raw_response_wrapper,
@@ -39,7 +31,14 @@
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.workflows import workflow_list_params, workflow_update_params
-from .instances.instances import InstancesResource, AsyncInstancesResource
+from .instances.instances import (
+    InstancesResource,
+    AsyncInstancesResource,
+    InstancesResourceWithRawResponse,
+    AsyncInstancesResourceWithRawResponse,
+    InstancesResourceWithStreamingResponse,
+    AsyncInstancesResourceWithStreamingResponse,
+)
 from ...types.workflows.workflow_get_response import WorkflowGetResponse
 from ...types.workflows.workflow_list_response import WorkflowListResponse
 from ...types.workflows.workflow_update_response import WorkflowUpdateResponse
diff --git a/src/cloudflare/resources/zero_trust/access/access.py b/src/cloudflare/resources/zero_trust/access/access.py
index 34a2a6b4bc3..c76631f16f5 100644
--- a/src/cloudflare/resources/zero_trust/access/access.py
+++ b/src/cloudflare/resources/zero_trust/access/access.py
@@ -10,14 +10,6 @@
     KeysResourceWithStreamingResponse,
     AsyncKeysResourceWithStreamingResponse,
 )
-from .logs import (
-    LogsResource,
-    AsyncLogsResource,
-    LogsResourceWithRawResponse,
-    AsyncLogsResourceWithRawResponse,
-    LogsResourceWithStreamingResponse,
-    AsyncLogsResourceWithStreamingResponse,
-)
 from .tags import (
     TagsResource,
     AsyncTagsResource,
@@ -26,14 +18,6 @@
     TagsResourceWithStreamingResponse,
     AsyncTagsResourceWithStreamingResponse,
 )
-from .users import (
-    UsersResource,
-    AsyncUsersResource,
-    UsersResourceWithRawResponse,
-    AsyncUsersResourceWithRawResponse,
-    UsersResourceWithStreamingResponse,
-    AsyncUsersResourceWithStreamingResponse,
-)
 from .groups import (
     GroupsResource,
     AsyncGroupsResource,
@@ -58,11 +42,41 @@
     BookmarksResourceWithStreamingResponse,
     AsyncBookmarksResourceWithStreamingResponse,
 )
-from .logs.logs import LogsResource, AsyncLogsResource
+from .logs.logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
 from ...._compat import cached_property
-from .users.users import UsersResource, AsyncUsersResource
+from .users.users import (
+    UsersResource,
+    AsyncUsersResource,
+    UsersResourceWithRawResponse,
+    AsyncUsersResourceWithRawResponse,
+    UsersResourceWithStreamingResponse,
+    AsyncUsersResourceWithStreamingResponse,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
-from .applications import (
+from .custom_pages import (
+    CustomPagesResource,
+    AsyncCustomPagesResource,
+    CustomPagesResourceWithRawResponse,
+    AsyncCustomPagesResourceWithRawResponse,
+    CustomPagesResourceWithStreamingResponse,
+    AsyncCustomPagesResourceWithStreamingResponse,
+)
+from .service_tokens import (
+    ServiceTokensResource,
+    AsyncServiceTokensResource,
+    ServiceTokensResourceWithRawResponse,
+    AsyncServiceTokensResourceWithRawResponse,
+    ServiceTokensResourceWithStreamingResponse,
+    AsyncServiceTokensResourceWithStreamingResponse,
+)
+from .applications.applications import (
     ApplicationsResource,
     AsyncApplicationsResource,
     ApplicationsResourceWithRawResponse,
@@ -70,7 +84,7 @@
     ApplicationsResourceWithStreamingResponse,
     AsyncApplicationsResourceWithStreamingResponse,
 )
-from .certificates import (
+from .certificates.certificates import (
     CertificatesResource,
     AsyncCertificatesResource,
     CertificatesResourceWithRawResponse,
@@ -78,15 +92,7 @@
     CertificatesResourceWithStreamingResponse,
     AsyncCertificatesResourceWithStreamingResponse,
 )
-from .custom_pages import (
-    CustomPagesResource,
-    AsyncCustomPagesResource,
-    CustomPagesResourceWithRawResponse,
-    AsyncCustomPagesResourceWithRawResponse,
-    CustomPagesResourceWithStreamingResponse,
-    AsyncCustomPagesResourceWithStreamingResponse,
-)
-from .infrastructure import (
+from .infrastructure.infrastructure import (
     InfrastructureResource,
     AsyncInfrastructureResource,
     InfrastructureResourceWithRawResponse,
@@ -94,17 +100,6 @@
     InfrastructureResourceWithStreamingResponse,
     AsyncInfrastructureResourceWithStreamingResponse,
 )
-from .service_tokens import (
-    ServiceTokensResource,
-    AsyncServiceTokensResource,
-    ServiceTokensResourceWithRawResponse,
-    AsyncServiceTokensResourceWithRawResponse,
-    ServiceTokensResourceWithStreamingResponse,
-    AsyncServiceTokensResourceWithStreamingResponse,
-)
-from .applications.applications import ApplicationsResource, AsyncApplicationsResource
-from .certificates.certificates import CertificatesResource, AsyncCertificatesResource
-from .infrastructure.infrastructure import InfrastructureResource, AsyncInfrastructureResource
 
 __all__ = ["AccessResource", "AsyncAccessResource"]
 
diff --git a/src/cloudflare/resources/zero_trust/access/applications/applications.py b/src/cloudflare/resources/zero_trust/access/applications/applications.py
index fbf653c4ace..d0c6fa62c7b 100644
--- a/src/cloudflare/resources/zero_trust/access/applications/applications.py
+++ b/src/cloudflare/resources/zero_trust/access/applications/applications.py
@@ -29,14 +29,6 @@
     async_maybe_transform,
 )
 from ....._compat import cached_property
-from .policy_tests import (
-    PolicyTestsResource,
-    AsyncPolicyTestsResource,
-    PolicyTestsResourceWithRawResponse,
-    AsyncPolicyTestsResourceWithRawResponse,
-    PolicyTestsResourceWithStreamingResponse,
-    AsyncPolicyTestsResourceWithStreamingResponse,
-)
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
     to_raw_response_wrapper,
@@ -55,7 +47,14 @@
     UserPolicyChecksResourceWithStreamingResponse,
     AsyncUserPolicyChecksResourceWithStreamingResponse,
 )
-from .policy_tests.policy_tests import PolicyTestsResource, AsyncPolicyTestsResource
+from .policy_tests.policy_tests import (
+    PolicyTestsResource,
+    AsyncPolicyTestsResource,
+    PolicyTestsResourceWithRawResponse,
+    AsyncPolicyTestsResourceWithRawResponse,
+    PolicyTestsResourceWithStreamingResponse,
+    AsyncPolicyTestsResourceWithStreamingResponse,
+)
 from .....types.zero_trust.access import (
     AppID,
     ApplicationType,
diff --git a/src/cloudflare/resources/zero_trust/devices/devices.py b/src/cloudflare/resources/zero_trust/devices/devices.py
index c8da8b5a201..3b946277c22 100644
--- a/src/cloudflare/resources/zero_trust/devices/devices.py
+++ b/src/cloudflare/resources/zero_trust/devices/devices.py
@@ -14,14 +14,6 @@
     RevokeResourceWithStreamingResponse,
     AsyncRevokeResourceWithStreamingResponse,
 )
-from .posture import (
-    PostureResource,
-    AsyncPostureResource,
-    PostureResourceWithRawResponse,
-    AsyncPostureResourceWithRawResponse,
-    PostureResourceWithStreamingResponse,
-    AsyncPostureResourceWithStreamingResponse,
-)
 from .networks import (
     NetworksResource,
     AsyncNetworksResource,
@@ -30,14 +22,6 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
-from .policies import (
-    PoliciesResource,
-    AsyncPoliciesResource,
-    PoliciesResourceWithRawResponse,
-    AsyncPoliciesResourceWithRawResponse,
-    PoliciesResourceWithStreamingResponse,
-    AsyncPoliciesResourceWithStreamingResponse,
-)
 from .settings import (
     SettingsResource,
     AsyncSettingsResource,
@@ -90,8 +74,22 @@
     AsyncOverrideCodesResourceWithStreamingResponse,
 )
 from ...._base_client import AsyncPaginator, make_request_options
-from .posture.posture import PostureResource, AsyncPostureResource
-from .policies.policies import PoliciesResource, AsyncPoliciesResource
+from .posture.posture import (
+    PostureResource,
+    AsyncPostureResource,
+    PostureResourceWithRawResponse,
+    AsyncPostureResourceWithRawResponse,
+    PostureResourceWithStreamingResponse,
+    AsyncPostureResourceWithStreamingResponse,
+)
+from .policies.policies import (
+    PoliciesResource,
+    AsyncPoliciesResource,
+    PoliciesResourceWithRawResponse,
+    AsyncPoliciesResourceWithRawResponse,
+    PoliciesResourceWithStreamingResponse,
+    AsyncPoliciesResourceWithStreamingResponse,
+)
 from ....types.zero_trust.device import Device
 from ....types.zero_trust.device_get_response import DeviceGetResponse
 
diff --git a/src/cloudflare/resources/zero_trust/devices/policies/policies.py b/src/cloudflare/resources/zero_trust/devices/policies/policies.py
index 5a0511a4ac6..263539f7358 100644
--- a/src/cloudflare/resources/zero_trust/devices/policies/policies.py
+++ b/src/cloudflare/resources/zero_trust/devices/policies/policies.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .custom import (
+from ....._compat import cached_property
+from ....._resource import SyncAPIResource, AsyncAPIResource
+from .custom.custom import (
     CustomResource,
     AsyncCustomResource,
     CustomResourceWithRawResponse,
@@ -10,7 +12,7 @@
     CustomResourceWithStreamingResponse,
     AsyncCustomResourceWithStreamingResponse,
 )
-from .default import (
+from .default.default import (
     DefaultResource,
     AsyncDefaultResource,
     DefaultResourceWithRawResponse,
@@ -18,10 +20,6 @@
     DefaultResourceWithStreamingResponse,
     AsyncDefaultResourceWithStreamingResponse,
 )
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-from .custom.custom import CustomResource, AsyncCustomResource
-from .default.default import DefaultResource, AsyncDefaultResource
 
 __all__ = ["PoliciesResource", "AsyncPoliciesResource"]
 
diff --git a/src/cloudflare/resources/zero_trust/dex/dex.py b/src/cloudflare/resources/zero_trust/dex/dex.py
index c8f838301e9..db00125451e 100644
--- a/src/cloudflare/resources/zero_trust/dex/dex.py
+++ b/src/cloudflare/resources/zero_trust/dex/dex.py
@@ -10,7 +10,8 @@
     ColosResourceWithStreamingResponse,
     AsyncColosResourceWithStreamingResponse,
 )
-from .tests import (
+from ...._compat import cached_property
+from .tests.tests import (
     TestsResource,
     AsyncTestsResource,
     TestsResourceWithRawResponse,
@@ -18,7 +19,16 @@
     TestsResourceWithStreamingResponse,
     AsyncTestsResourceWithStreamingResponse,
 )
-from .commands import (
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .traceroute_tests import (
+    TracerouteTestsResource,
+    AsyncTracerouteTestsResource,
+    TracerouteTestsResourceWithRawResponse,
+    AsyncTracerouteTestsResourceWithRawResponse,
+    TracerouteTestsResourceWithStreamingResponse,
+    AsyncTracerouteTestsResourceWithStreamingResponse,
+)
+from .commands.commands import (
     CommandsResource,
     AsyncCommandsResource,
     CommandsResourceWithRawResponse,
@@ -26,8 +36,7 @@
     CommandsResourceWithStreamingResponse,
     AsyncCommandsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from .http_tests import (
+from .http_tests.http_tests import (
     HTTPTestsResource,
     AsyncHTTPTestsResource,
     HTTPTestsResourceWithRawResponse,
@@ -35,9 +44,7 @@
     HTTPTestsResourceWithStreamingResponse,
     AsyncHTTPTestsResourceWithStreamingResponse,
 )
-from .tests.tests import TestsResource, AsyncTestsResource
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .fleet_status import (
+from .fleet_status.fleet_status import (
     FleetStatusResource,
     AsyncFleetStatusResource,
     FleetStatusResourceWithRawResponse,
@@ -45,17 +52,7 @@
     FleetStatusResourceWithStreamingResponse,
     AsyncFleetStatusResourceWithStreamingResponse,
 )
-from .traceroute_tests import (
-    TracerouteTestsResource,
-    AsyncTracerouteTestsResource,
-    TracerouteTestsResourceWithRawResponse,
-    AsyncTracerouteTestsResourceWithRawResponse,
-    TracerouteTestsResourceWithStreamingResponse,
-    AsyncTracerouteTestsResourceWithStreamingResponse,
-)
-from .commands.commands import CommandsResource, AsyncCommandsResource
-from .http_tests.http_tests import HTTPTestsResource, AsyncHTTPTestsResource
-from .traceroute_test_results import (
+from .traceroute_test_results.traceroute_test_results import (
     TracerouteTestResultsResource,
     AsyncTracerouteTestResultsResource,
     TracerouteTestResultsResourceWithRawResponse,
@@ -63,11 +60,6 @@
     TracerouteTestResultsResourceWithStreamingResponse,
     AsyncTracerouteTestResultsResourceWithStreamingResponse,
 )
-from .fleet_status.fleet_status import FleetStatusResource, AsyncFleetStatusResource
-from .traceroute_test_results.traceroute_test_results import (
-    TracerouteTestResultsResource,
-    AsyncTracerouteTestResultsResource,
-)
 
 __all__ = ["DEXResource", "AsyncDEXResource"]
 
diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
index f6656c172f2..0c2b730114f 100644
--- a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
+++ b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py
@@ -14,14 +14,6 @@
     UploadResourceWithStreamingResponse,
     AsyncUploadResourceWithStreamingResponse,
 )
-from .versions import (
-    VersionsResource,
-    AsyncVersionsResource,
-    VersionsResourceWithRawResponse,
-    AsyncVersionsResourceWithRawResponse,
-    VersionsResourceWithStreamingResponse,
-    AsyncVersionsResourceWithStreamingResponse,
-)
 from ....._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
 from ....._utils import (
     maybe_transform,
@@ -38,7 +30,14 @@
 from ....._wrappers import ResultWrapper
 from .....pagination import SyncSinglePage, AsyncSinglePage
 from ....._base_client import AsyncPaginator, make_request_options
-from .versions.versions import VersionsResource, AsyncVersionsResource
+from .versions.versions import (
+    VersionsResource,
+    AsyncVersionsResource,
+    VersionsResourceWithRawResponse,
+    AsyncVersionsResourceWithRawResponse,
+    VersionsResourceWithStreamingResponse,
+    AsyncVersionsResourceWithStreamingResponse,
+)
 from .....types.zero_trust.dlp import dataset_create_params, dataset_update_params
 from .....types.zero_trust.dlp.dataset import Dataset
 from .....types.zero_trust.dlp.dataset_creation import DatasetCreation
diff --git a/src/cloudflare/resources/zero_trust/dlp/dlp.py b/src/cloudflare/resources/zero_trust/dlp/dlp.py
index 2b662155d69..742d20a6233 100644
--- a/src/cloudflare/resources/zero_trust/dlp/dlp.py
+++ b/src/cloudflare/resources/zero_trust/dlp/dlp.py
@@ -18,14 +18,6 @@
     EntriesResourceWithStreamingResponse,
     AsyncEntriesResourceWithStreamingResponse,
 )
-from .datasets import (
-    DatasetsResource,
-    AsyncDatasetsResource,
-    DatasetsResourceWithRawResponse,
-    AsyncDatasetsResourceWithRawResponse,
-    DatasetsResourceWithStreamingResponse,
-    AsyncDatasetsResourceWithStreamingResponse,
-)
 from .patterns import (
     PatternsResource,
     AsyncPatternsResource,
@@ -34,14 +26,6 @@
     PatternsResourceWithStreamingResponse,
     AsyncPatternsResourceWithStreamingResponse,
 )
-from .profiles import (
-    ProfilesResource,
-    AsyncProfilesResource,
-    ProfilesResourceWithRawResponse,
-    AsyncProfilesResourceWithRawResponse,
-    ProfilesResourceWithStreamingResponse,
-    AsyncProfilesResourceWithStreamingResponse,
-)
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from .payload_logs import (
@@ -52,8 +36,22 @@
     PayloadLogsResourceWithStreamingResponse,
     AsyncPayloadLogsResourceWithStreamingResponse,
 )
-from .datasets.datasets import DatasetsResource, AsyncDatasetsResource
-from .profiles.profiles import ProfilesResource, AsyncProfilesResource
+from .datasets.datasets import (
+    DatasetsResource,
+    AsyncDatasetsResource,
+    DatasetsResourceWithRawResponse,
+    AsyncDatasetsResourceWithRawResponse,
+    DatasetsResourceWithStreamingResponse,
+    AsyncDatasetsResourceWithStreamingResponse,
+)
+from .profiles.profiles import (
+    ProfilesResource,
+    AsyncProfilesResource,
+    ProfilesResourceWithRawResponse,
+    AsyncProfilesResourceWithRawResponse,
+    ProfilesResourceWithStreamingResponse,
+    AsyncProfilesResourceWithStreamingResponse,
+)
 
 __all__ = ["DLPResource", "AsyncDLPResource"]
 
diff --git a/src/cloudflare/resources/zero_trust/gateway/gateway.py b/src/cloudflare/resources/zero_trust/gateway/gateway.py
index 4942f71301b..d4477354e20 100644
--- a/src/cloudflare/resources/zero_trust/gateway/gateway.py
+++ b/src/cloudflare/resources/zero_trust/gateway/gateway.py
@@ -6,14 +6,6 @@
 
 import httpx
 
-from .lists import (
-    ListsResource,
-    AsyncListsResource,
-    ListsResourceWithRawResponse,
-    AsyncListsResourceWithRawResponse,
-    ListsResourceWithStreamingResponse,
-    AsyncListsResourceWithStreamingResponse,
-)
 from .rules import (
     RulesResource,
     AsyncRulesResource,
@@ -56,7 +48,14 @@
     CategoriesResourceWithStreamingResponse,
     AsyncCategoriesResourceWithStreamingResponse,
 )
-from .lists.lists import ListsResource, AsyncListsResource
+from .lists.lists import (
+    ListsResource,
+    AsyncListsResource,
+    ListsResourceWithRawResponse,
+    AsyncListsResourceWithRawResponse,
+    ListsResourceWithStreamingResponse,
+    AsyncListsResourceWithStreamingResponse,
+)
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
     to_raw_response_wrapper,
@@ -73,14 +72,6 @@
     CertificatesResourceWithStreamingResponse,
     AsyncCertificatesResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
-)
 from ...._base_client import make_request_options
 from .proxy_endpoints import (
     ProxyEndpointsResource,
@@ -98,7 +89,14 @@
     AuditSSHSettingsResourceWithStreamingResponse,
     AsyncAuditSSHSettingsResourceWithStreamingResponse,
 )
-from .configurations.configurations import ConfigurationsResource, AsyncConfigurationsResource
+from .configurations.configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
 from ....types.zero_trust.gateway_list_response import GatewayListResponse
 from ....types.zero_trust.gateway_create_response import GatewayCreateResponse
 
diff --git a/src/cloudflare/resources/zero_trust/networks/networks.py b/src/cloudflare/resources/zero_trust/networks/networks.py
index e3ad214a451..5e7dce7e20b 100644
--- a/src/cloudflare/resources/zero_trust/networks/networks.py
+++ b/src/cloudflare/resources/zero_trust/networks/networks.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from .routes import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .routes.routes import (
     RoutesResource,
     AsyncRoutesResource,
     RoutesResourceWithRawResponse,
@@ -10,9 +12,6 @@
     RoutesResourceWithStreamingResponse,
     AsyncRoutesResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .routes.routes import RoutesResource, AsyncRoutesResource
 from .virtual_networks import (
     VirtualNetworksResource,
     AsyncVirtualNetworksResource,
diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
index b088e45033c..614441af56c 100644
--- a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
+++ b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py
@@ -32,7 +32,8 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from .integrations import (
+from ...._base_client import make_request_options
+from .integrations.integrations import (
     IntegrationsResource,
     AsyncIntegrationsResource,
     IntegrationsResourceWithRawResponse,
@@ -40,8 +41,6 @@
     IntegrationsResourceWithStreamingResponse,
     AsyncIntegrationsResourceWithStreamingResponse,
 )
-from ...._base_client import make_request_options
-from .integrations.integrations import IntegrationsResource, AsyncIntegrationsResource
 from ....types.zero_trust.risk_scoring_get_response import RiskScoringGetResponse
 
 __all__ = ["RiskScoringResource", "AsyncRiskScoringResource"]
diff --git a/src/cloudflare/resources/zero_trust/zero_trust.py b/src/cloudflare/resources/zero_trust/zero_trust.py
index c873d58971b..899464403f9 100644
--- a/src/cloudflare/resources/zero_trust/zero_trust.py
+++ b/src/cloudflare/resources/zero_trust/zero_trust.py
@@ -2,7 +2,15 @@
 
 from __future__ import annotations
 
-from .dex import (
+from .seats import (
+    SeatsResource,
+    AsyncSeatsResource,
+    SeatsResourceWithRawResponse,
+    AsyncSeatsResourceWithRawResponse,
+    SeatsResourceWithStreamingResponse,
+    AsyncSeatsResourceWithStreamingResponse,
+)
+from .dex.dex import (
     DEXResource,
     AsyncDEXResource,
     DEXResourceWithRawResponse,
@@ -10,7 +18,7 @@
     DEXResourceWithStreamingResponse,
     AsyncDEXResourceWithStreamingResponse,
 )
-from .dlp import (
+from .dlp.dlp import (
     DLPResource,
     AsyncDLPResource,
     DLPResourceWithRawResponse,
@@ -18,15 +26,9 @@
     DLPResourceWithStreamingResponse,
     AsyncDLPResourceWithStreamingResponse,
 )
-from .seats import (
-    SeatsResource,
-    AsyncSeatsResource,
-    SeatsResourceWithRawResponse,
-    AsyncSeatsResourceWithRawResponse,
-    SeatsResourceWithStreamingResponse,
-    AsyncSeatsResourceWithStreamingResponse,
-)
-from .access import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .access.access import (
     AccessResource,
     AsyncAccessResource,
     AccessResourceWithRawResponse,
@@ -34,7 +36,7 @@
     AccessResourceWithStreamingResponse,
     AsyncAccessResourceWithStreamingResponse,
 )
-from .devices import (
+from .devices.devices import (
     DevicesResource,
     AsyncDevicesResource,
     DevicesResourceWithRawResponse,
@@ -42,9 +44,7 @@
     DevicesResourceWithStreamingResponse,
     AsyncDevicesResourceWithStreamingResponse,
 )
-from .dex.dex import DEXResource, AsyncDEXResource
-from .dlp.dlp import DLPResource, AsyncDLPResource
-from .gateway import (
+from .gateway.gateway import (
     GatewayResource,
     AsyncGatewayResource,
     GatewayResourceWithRawResponse,
@@ -52,7 +52,7 @@
     GatewayResourceWithStreamingResponse,
     AsyncGatewayResourceWithStreamingResponse,
 )
-from .tunnels import (
+from .tunnels.tunnels import (
     TunnelsResource,
     AsyncTunnelsResource,
     TunnelsResourceWithRawResponse,
@@ -60,7 +60,7 @@
     TunnelsResourceWithStreamingResponse,
     AsyncTunnelsResourceWithStreamingResponse,
 )
-from .networks import (
+from .networks.networks import (
     NetworksResource,
     AsyncNetworksResource,
     NetworksResourceWithRawResponse,
@@ -68,29 +68,6 @@
     NetworksResourceWithStreamingResponse,
     AsyncNetworksResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .risk_scoring import (
-    RiskScoringResource,
-    AsyncRiskScoringResource,
-    RiskScoringResourceWithRawResponse,
-    AsyncRiskScoringResourceWithRawResponse,
-    RiskScoringResourceWithStreamingResponse,
-    AsyncRiskScoringResourceWithStreamingResponse,
-)
-from .access.access import AccessResource, AsyncAccessResource
-from .organizations import (
-    OrganizationsResource,
-    AsyncOrganizationsResource,
-    OrganizationsResourceWithRawResponse,
-    AsyncOrganizationsResourceWithRawResponse,
-    OrganizationsResourceWithStreamingResponse,
-    AsyncOrganizationsResourceWithStreamingResponse,
-)
-from .devices.devices import DevicesResource, AsyncDevicesResource
-from .gateway.gateway import GatewayResource, AsyncGatewayResource
-from .tunnels.tunnels import TunnelsResource, AsyncTunnelsResource
-from .networks.networks import NetworksResource, AsyncNetworksResource
 from .identity_providers import (
     IdentityProvidersResource,
     AsyncIdentityProvidersResource,
@@ -107,8 +84,22 @@
     ConnectivitySettingsResourceWithStreamingResponse,
     AsyncConnectivitySettingsResourceWithStreamingResponse,
 )
-from .risk_scoring.risk_scoring import RiskScoringResource, AsyncRiskScoringResource
-from .organizations.organizations import OrganizationsResource, AsyncOrganizationsResource
+from .risk_scoring.risk_scoring import (
+    RiskScoringResource,
+    AsyncRiskScoringResource,
+    RiskScoringResourceWithRawResponse,
+    AsyncRiskScoringResourceWithRawResponse,
+    RiskScoringResourceWithStreamingResponse,
+    AsyncRiskScoringResourceWithStreamingResponse,
+)
+from .organizations.organizations import (
+    OrganizationsResource,
+    AsyncOrganizationsResource,
+    OrganizationsResourceWithRawResponse,
+    AsyncOrganizationsResourceWithRawResponse,
+    OrganizationsResourceWithStreamingResponse,
+    AsyncOrganizationsResourceWithStreamingResponse,
+)
 
 __all__ = ["ZeroTrustResource", "AsyncZeroTrustResource"]