diff --git a/src/finch/pagination.py b/src/finch/pagination.py
index c90207a3..33ed744d 100644
--- a/src/finch/pagination.py
+++ b/src/finch/pagination.py
@@ -8,7 +8,7 @@
 from ._utils import is_mapping
 from ._models import BaseModel
 from ._base_client import BasePage, PageInfo, BaseSyncPage, BaseAsyncPage
-from .types.shared import Paging
+from .types.shared.paging import Paging
 
 __all__ = [
     "SyncSinglePage",
diff --git a/src/finch/resources/access_tokens.py b/src/finch/resources/access_tokens.py
index 8b5086d7..4996eb86 100644
--- a/src/finch/resources/access_tokens.py
+++ b/src/finch/resources/access_tokens.py
@@ -5,7 +5,7 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import CreateAccessTokenResponse, access_token_create_params
+from ..types import access_token_create_params
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._utils import (
     maybe_transform,
@@ -17,6 +17,7 @@
 from .._base_client import (
     make_request_options,
 )
+from ..types.create_access_token_response import CreateAccessTokenResponse
 
 __all__ = ["AccessTokens", "AsyncAccessTokens"]
 
diff --git a/src/finch/resources/account.py b/src/finch/resources/account.py
index 81ed126b..43d1347d 100644
--- a/src/finch/resources/account.py
+++ b/src/finch/resources/account.py
@@ -5,7 +5,6 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import Introspection, DisconnectResponse
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
@@ -13,6 +12,8 @@
 from .._base_client import (
     make_request_options,
 )
+from ..types.introspection import Introspection
+from ..types.disconnect_response import DisconnectResponse
 
 __all__ = ["Account", "AsyncAccount"]
 
diff --git a/src/finch/resources/hris/benefits/benefits.py b/src/finch/resources/hris/benefits/benefits.py
index a35baa5b..9b6058e8 100644
--- a/src/finch/resources/hris/benefits/benefits.py
+++ b/src/finch/resources/hris/benefits/benefits.py
@@ -24,20 +24,17 @@
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ....pagination import SyncSinglePage, AsyncSinglePage
-from ....types.hris import (
-    BenefitType,
-    CompanyBenefit,
-    BenefitFrequency,
-    SupportedBenefit,
-    UpdateCompanyBenefitResponse,
-    CreateCompanyBenefitsResponse,
-    benefit_create_params,
-    benefit_update_params,
-)
+from ....types.hris import BenefitType, BenefitFrequency, benefit_create_params, benefit_update_params
 from ...._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ....types.hris.benefit_type import BenefitType
+from ....types.hris.company_benefit import CompanyBenefit
+from ....types.hris.benefit_frequency import BenefitFrequency
+from ....types.hris.supported_benefit import SupportedBenefit
+from ....types.hris.update_company_benefit_response import UpdateCompanyBenefitResponse
+from ....types.hris.create_company_benefits_response import CreateCompanyBenefitsResponse
 
 __all__ = ["Benefits", "AsyncBenefits"]
 
diff --git a/src/finch/resources/hris/benefits/individuals.py b/src/finch/resources/hris/benefits/individuals.py
index f3a49bbe..1695eeeb 100644
--- a/src/finch/resources/hris/benefits/individuals.py
+++ b/src/finch/resources/hris/benefits/individuals.py
@@ -18,14 +18,14 @@
     make_request_options,
 )
 from ....types.hris.benefits import (
-    IndividualBenefit,
-    EnrolledIndividual,
-    UnenrolledIndividual,
-    IndividualEnrolledIDsResponse,
     individual_enroll_many_params,
     individual_unenroll_many_params,
     individual_retrieve_many_benefits_params,
 )
+from ....types.hris.benefits.individual_benefit import IndividualBenefit
+from ....types.hris.benefits.enrolled_individual import EnrolledIndividual
+from ....types.hris.benefits.unenrolled_individual import UnenrolledIndividual
+from ....types.hris.benefits.individual_enrolled_ids_response import IndividualEnrolledIDsResponse
 
 __all__ = ["Individuals", "AsyncIndividuals"]
 
diff --git a/src/finch/resources/hris/company.py b/src/finch/resources/hris/company.py
index dd84b156..5d796f0b 100644
--- a/src/finch/resources/hris/company.py
+++ b/src/finch/resources/hris/company.py
@@ -9,10 +9,10 @@
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
-from ...types.hris import Company
 from ..._base_client import (
     make_request_options,
 )
+from ...types.hris.company import Company
 
 __all__ = ["CompanyResource", "AsyncCompanyResource"]
 
diff --git a/src/finch/resources/hris/directory.py b/src/finch/resources/hris/directory.py
index cacfc87c..9a7a7e04 100644
--- a/src/finch/resources/hris/directory.py
+++ b/src/finch/resources/hris/directory.py
@@ -13,11 +13,12 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncIndividualsPage, AsyncIndividualsPage
-from ...types.hris import IndividualInDirectory, directory_list_params
+from ...types.hris import directory_list_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.hris.individual_in_directory import IndividualInDirectory
 
 __all__ = ["Directory", "AsyncDirectory"]
 
diff --git a/src/finch/resources/hris/employments.py b/src/finch/resources/hris/employments.py
index 2c516663..46b3ddd5 100644
--- a/src/finch/resources/hris/employments.py
+++ b/src/finch/resources/hris/employments.py
@@ -13,11 +13,12 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncResponsesPage, AsyncResponsesPage
-from ...types.hris import EmploymentDataResponse, employment_retrieve_many_params
+from ...types.hris import employment_retrieve_many_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.hris.employment_data_response import EmploymentDataResponse
 
 __all__ = ["Employments", "AsyncEmployments"]
 
diff --git a/src/finch/resources/hris/individuals.py b/src/finch/resources/hris/individuals.py
index ff130b5b..7b3923ed 100644
--- a/src/finch/resources/hris/individuals.py
+++ b/src/finch/resources/hris/individuals.py
@@ -13,11 +13,12 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncResponsesPage, AsyncResponsesPage
-from ...types.hris import IndividualResponse, individual_retrieve_many_params
+from ...types.hris import individual_retrieve_many_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.hris.individual_response import IndividualResponse
 
 __all__ = ["Individuals", "AsyncIndividuals"]
 
diff --git a/src/finch/resources/hris/pay_statements.py b/src/finch/resources/hris/pay_statements.py
index dd229e4c..db119680 100644
--- a/src/finch/resources/hris/pay_statements.py
+++ b/src/finch/resources/hris/pay_statements.py
@@ -13,11 +13,12 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncResponsesPage, AsyncResponsesPage
-from ...types.hris import PayStatementResponse, pay_statement_retrieve_many_params
+from ...types.hris import pay_statement_retrieve_many_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.hris.pay_statement_response import PayStatementResponse
 
 __all__ = ["PayStatements", "AsyncPayStatements"]
 
diff --git a/src/finch/resources/hris/payments.py b/src/finch/resources/hris/payments.py
index 6392133a..b554de10 100644
--- a/src/finch/resources/hris/payments.py
+++ b/src/finch/resources/hris/payments.py
@@ -14,11 +14,12 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncSinglePage, AsyncSinglePage
-from ...types.hris import Payment, payment_list_params
+from ...types.hris import payment_list_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.hris.payment import Payment
 
 __all__ = ["Payments", "AsyncPayments"]
 
diff --git a/src/finch/resources/jobs/automated.py b/src/finch/resources/jobs/automated.py
index 9068ce1c..98389fa7 100644
--- a/src/finch/resources/jobs/automated.py
+++ b/src/finch/resources/jobs/automated.py
@@ -16,11 +16,13 @@
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
 from ...pagination import SyncPage, AsyncPage
-from ...types.jobs import AutomatedAsyncJob, AutomatedCreateResponse, automated_list_params, automated_create_params
+from ...types.jobs import automated_list_params, automated_create_params
 from ..._base_client import (
     AsyncPaginator,
     make_request_options,
 )
+from ...types.jobs.automated_async_job import AutomatedAsyncJob
+from ...types.jobs.automated_create_response import AutomatedCreateResponse
 
 __all__ = ["Automated", "AsyncAutomated"]
 
diff --git a/src/finch/resources/jobs/manual.py b/src/finch/resources/jobs/manual.py
index 81fd40a7..7a792d4d 100644
--- a/src/finch/resources/jobs/manual.py
+++ b/src/finch/resources/jobs/manual.py
@@ -9,10 +9,10 @@
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import to_streamed_response_wrapper, async_to_streamed_response_wrapper
-from ...types.jobs import ManualAsyncJob
 from ..._base_client import (
     make_request_options,
 )
+from ...types.jobs.manual_async_job import ManualAsyncJob
 
 __all__ = ["Manual", "AsyncManual"]
 
diff --git a/src/finch/resources/providers.py b/src/finch/resources/providers.py
index 4a37ee46..82ebb524 100644
--- a/src/finch/resources/providers.py
+++ b/src/finch/resources/providers.py
@@ -5,7 +5,6 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import Provider
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
@@ -15,6 +14,7 @@
     AsyncPaginator,
     make_request_options,
 )
+from ..types.provider import Provider
 
 __all__ = ["Providers", "AsyncProviders"]
 
diff --git a/src/finch/resources/request_forwarding.py b/src/finch/resources/request_forwarding.py
index 337f85e1..73839d5b 100644
--- a/src/finch/resources/request_forwarding.py
+++ b/src/finch/resources/request_forwarding.py
@@ -7,7 +7,7 @@
 import httpx
 
 from .. import _legacy_response
-from ..types import RequestForwardingForwardResponse, request_forwarding_forward_params
+from ..types import request_forwarding_forward_params
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from .._utils import (
     maybe_transform,
@@ -19,6 +19,7 @@
 from .._base_client import (
     make_request_options,
 )
+from ..types.request_forwarding_forward_response import RequestForwardingForwardResponse
 
 __all__ = ["RequestForwarding", "AsyncRequestForwarding"]
 
diff --git a/src/finch/resources/sandbox/company.py b/src/finch/resources/sandbox/company.py
index 7c528a2b..10fec4f3 100644
--- a/src/finch/resources/sandbox/company.py
+++ b/src/finch/resources/sandbox/company.py
@@ -7,7 +7,6 @@
 import httpx
 
 from ... import _legacy_response
-from ...types import LocationParam
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -19,7 +18,9 @@
 from ..._base_client import (
     make_request_options,
 )
-from ...types.sandbox import CompanyUpdateResponse, company_update_params
+from ...types.sandbox import company_update_params
+from ...types.location_param import LocationParam
+from ...types.sandbox.company_update_response import CompanyUpdateResponse
 
 __all__ = ["Company", "AsyncCompany"]
 
diff --git a/src/finch/resources/sandbox/connections/accounts.py b/src/finch/resources/sandbox/connections/accounts.py
index b472adab..6fcab86a 100644
--- a/src/finch/resources/sandbox/connections/accounts.py
+++ b/src/finch/resources/sandbox/connections/accounts.py
@@ -19,13 +19,10 @@
 from ...._base_client import (
     make_request_options,
 )
-from ....types.shared import ConnectionStatusType
-from ....types.sandbox.connections import (
-    AccountCreateResponse,
-    AccountUpdateResponse,
-    account_create_params,
-    account_update_params,
-)
+from ....types.sandbox.connections import account_create_params, account_update_params
+from ....types.shared.connection_status_type import ConnectionStatusType
+from ....types.sandbox.connections.account_create_response import AccountCreateResponse
+from ....types.sandbox.connections.account_update_response import AccountUpdateResponse
 
 __all__ = ["Accounts", "AsyncAccounts"]
 
diff --git a/src/finch/resources/sandbox/connections/connections.py b/src/finch/resources/sandbox/connections/connections.py
index 4e86bcd5..d8d34b85 100644
--- a/src/finch/resources/sandbox/connections/connections.py
+++ b/src/finch/resources/sandbox/connections/connections.py
@@ -27,7 +27,8 @@
 from ...._base_client import (
     make_request_options,
 )
-from ....types.sandbox import ConnectionCreateResponse, connection_create_params
+from ....types.sandbox import connection_create_params
+from ....types.sandbox.connection_create_response import ConnectionCreateResponse
 
 __all__ = ["Connections", "AsyncConnections"]
 
diff --git a/src/finch/resources/sandbox/directory.py b/src/finch/resources/sandbox/directory.py
index b46787bf..aae91df1 100644
--- a/src/finch/resources/sandbox/directory.py
+++ b/src/finch/resources/sandbox/directory.py
@@ -18,7 +18,8 @@
 from ..._base_client import (
     make_request_options,
 )
-from ...types.sandbox import DirectoryCreateResponse, directory_create_params
+from ...types.sandbox import directory_create_params
+from ...types.sandbox.directory_create_response import DirectoryCreateResponse
 
 __all__ = ["Directory", "AsyncDirectory"]
 
diff --git a/src/finch/resources/sandbox/employment.py b/src/finch/resources/sandbox/employment.py
index f4771306..8c2533d3 100644
--- a/src/finch/resources/sandbox/employment.py
+++ b/src/finch/resources/sandbox/employment.py
@@ -7,7 +7,6 @@
 import httpx
 
 from ... import _legacy_response
-from ...types import IncomeParam, LocationParam
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -19,7 +18,10 @@
 from ..._base_client import (
     make_request_options,
 )
-from ...types.sandbox import EmploymentUpdateResponse, employment_update_params
+from ...types.sandbox import employment_update_params
+from ...types.income_param import IncomeParam
+from ...types.location_param import LocationParam
+from ...types.sandbox.employment_update_response import EmploymentUpdateResponse
 
 __all__ = ["Employment", "AsyncEmployment"]
 
diff --git a/src/finch/resources/sandbox/individual.py b/src/finch/resources/sandbox/individual.py
index 32c75585..9be671d5 100644
--- a/src/finch/resources/sandbox/individual.py
+++ b/src/finch/resources/sandbox/individual.py
@@ -8,7 +8,6 @@
 import httpx
 
 from ... import _legacy_response
-from ...types import LocationParam
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     maybe_transform,
@@ -20,7 +19,9 @@
 from ..._base_client import (
     make_request_options,
 )
-from ...types.sandbox import IndividualUpdateResponse, individual_update_params
+from ...types.sandbox import individual_update_params
+from ...types.location_param import LocationParam
+from ...types.sandbox.individual_update_response import IndividualUpdateResponse
 
 __all__ = ["Individual", "AsyncIndividual"]
 
diff --git a/src/finch/resources/sandbox/jobs/configuration.py b/src/finch/resources/sandbox/jobs/configuration.py
index bb8d159f..46fd5cad 100644
--- a/src/finch/resources/sandbox/jobs/configuration.py
+++ b/src/finch/resources/sandbox/jobs/configuration.py
@@ -18,7 +18,9 @@
 from ...._base_client import (
     make_request_options,
 )
-from ....types.sandbox.jobs import SandboxJobConfiguration, ConfigurationRetrieveResponse, configuration_update_params
+from ....types.sandbox.jobs import configuration_update_params
+from ....types.sandbox.jobs.sandbox_job_configuration import SandboxJobConfiguration
+from ....types.sandbox.jobs.configuration_retrieve_response import ConfigurationRetrieveResponse
 
 __all__ = ["Configuration", "AsyncConfiguration"]
 
diff --git a/src/finch/resources/sandbox/jobs/jobs.py b/src/finch/resources/sandbox/jobs/jobs.py
index e504210b..fd6cd9ea 100644
--- a/src/finch/resources/sandbox/jobs/jobs.py
+++ b/src/finch/resources/sandbox/jobs/jobs.py
@@ -26,7 +26,8 @@
 from ...._base_client import (
     make_request_options,
 )
-from ....types.sandbox import JobCreateResponse, job_create_params
+from ....types.sandbox import job_create_params
+from ....types.sandbox.job_create_response import JobCreateResponse
 
 __all__ = ["Jobs", "AsyncJobs"]
 
diff --git a/src/finch/resources/sandbox/payment.py b/src/finch/resources/sandbox/payment.py
index 678d24e8..7a1b057a 100644
--- a/src/finch/resources/sandbox/payment.py
+++ b/src/finch/resources/sandbox/payment.py
@@ -18,7 +18,8 @@
 from ..._base_client import (
     make_request_options,
 )
-from ...types.sandbox import PaymentCreateResponse, payment_create_params
+from ...types.sandbox import payment_create_params
+from ...types.sandbox.payment_create_response import PaymentCreateResponse
 
 __all__ = ["Payment", "AsyncPayment"]
 
diff --git a/src/finch/types/account_update_event.py b/src/finch/types/account_update_event.py
index eca89e1a..a8c50d29 100644
--- a/src/finch/types/account_update_event.py
+++ b/src/finch/types/account_update_event.py
@@ -3,10 +3,10 @@
 from typing import Optional
 from typing_extensions import Literal
 
-from .hris import BenefitsSupport
-from .shared import ConnectionStatusType
 from .._models import BaseModel
 from .base_webhook_event import BaseWebhookEvent
+from .hris.benefits_support import BenefitsSupport
+from .shared.connection_status_type import ConnectionStatusType
 
 __all__ = [
     "AccountUpdateEvent",
diff --git a/src/finch/types/hris/pay_statement_response_body.py b/src/finch/types/hris/pay_statement_response_body.py
index 004894e9..51ef1584 100644
--- a/src/finch/types/hris/pay_statement_response_body.py
+++ b/src/finch/types/hris/pay_statement_response_body.py
@@ -2,9 +2,9 @@
 
 from typing import List, Optional
 
-from ..shared import Paging
 from ..._models import BaseModel
 from .pay_statement import PayStatement
+from ..shared.paging import Paging
 
 __all__ = ["PayStatementResponseBody"]
 
diff --git a/src/finch/types/hris/support_per_benefit_type.py b/src/finch/types/hris/support_per_benefit_type.py
index 62c5c15d..31b3f7e2 100644
--- a/src/finch/types/hris/support_per_benefit_type.py
+++ b/src/finch/types/hris/support_per_benefit_type.py
@@ -2,8 +2,8 @@
 
 from typing import Optional
 
-from ..shared import OperationSupportMatrix
 from ..._models import BaseModel
+from ..shared.operation_support_matrix import OperationSupportMatrix
 
 __all__ = ["SupportPerBenefitType"]
 
diff --git a/src/finch/types/introspection.py b/src/finch/types/introspection.py
index ff876a95..b5c34216 100644
--- a/src/finch/types/introspection.py
+++ b/src/finch/types/introspection.py
@@ -3,8 +3,8 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from .shared import ConnectionStatusType
 from .._models import BaseModel
+from .shared.connection_status_type import ConnectionStatusType
 
 __all__ = ["Introspection", "AuthenticationMethods", "AuthenticationMethodsConnectionStatus"]
 
diff --git a/src/finch/types/provider.py b/src/finch/types/provider.py
index 231a3354..58c62d3a 100644
--- a/src/finch/types/provider.py
+++ b/src/finch/types/provider.py
@@ -3,8 +3,8 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from .hris import BenefitsSupport
 from .._models import BaseModel
+from .hris.benefits_support import BenefitsSupport
 
 __all__ = [
     "Provider",
diff --git a/src/finch/types/sandbox/connections/account_update_params.py b/src/finch/types/sandbox/connections/account_update_params.py
index 66988111..6e3e0f30 100644
--- a/src/finch/types/sandbox/connections/account_update_params.py
+++ b/src/finch/types/sandbox/connections/account_update_params.py
@@ -4,7 +4,7 @@
 
 from typing_extensions import TypedDict
 
-from ...shared import ConnectionStatusType
+from ...shared.connection_status_type import ConnectionStatusType
 
 __all__ = ["AccountUpdateParams"]
 
diff --git a/src/finch/types/sandbox/payment_create_params.py b/src/finch/types/sandbox/payment_create_params.py
index e3068be9..202ab8c9 100644
--- a/src/finch/types/sandbox/payment_create_params.py
+++ b/src/finch/types/sandbox/payment_create_params.py
@@ -5,8 +5,8 @@
 from typing import Iterable, Optional
 from typing_extensions import Literal, TypedDict
 
-from ..hris import BenefitType
 from ..money_param import MoneyParam
+from ..hris.benefit_type import BenefitType
 
 __all__ = [
     "PaymentCreateParams",
diff --git a/tests/api_resources/hris/benefits/test_individuals.py b/tests/api_resources/hris/benefits/test_individuals.py
index 9defbc96..252b12ed 100644
--- a/tests/api_resources/hris/benefits/test_individuals.py
+++ b/tests/api_resources/hris/benefits/test_individuals.py
@@ -10,12 +10,10 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncSinglePage, AsyncSinglePage
-from finch.types.hris.benefits import (
-    IndividualBenefit,
-    EnrolledIndividual,
-    UnenrolledIndividual,
-    IndividualEnrolledIDsResponse,
-)
+from finch.types.hris.benefits.individual_benefit import IndividualBenefit
+from finch.types.hris.benefits.enrolled_individual import EnrolledIndividual
+from finch.types.hris.benefits.unenrolled_individual import UnenrolledIndividual
+from finch.types.hris.benefits.individual_enrolled_ids_response import IndividualEnrolledIDsResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_benefits.py b/tests/api_resources/hris/test_benefits.py
index ea02d4ac..6be54989 100644
--- a/tests/api_resources/hris/test_benefits.py
+++ b/tests/api_resources/hris/test_benefits.py
@@ -10,12 +10,10 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncSinglePage, AsyncSinglePage
-from finch.types.hris import (
-    CompanyBenefit,
-    SupportedBenefit,
-    UpdateCompanyBenefitResponse,
-    CreateCompanyBenefitsResponse,
-)
+from finch.types.hris.company_benefit import CompanyBenefit
+from finch.types.hris.supported_benefit import SupportedBenefit
+from finch.types.hris.update_company_benefit_response import UpdateCompanyBenefitResponse
+from finch.types.hris.create_company_benefits_response import CreateCompanyBenefitsResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_company.py b/tests/api_resources/hris/test_company.py
index ea4052f9..8ea9dba0 100644
--- a/tests/api_resources/hris/test_company.py
+++ b/tests/api_resources/hris/test_company.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.hris import Company
+from finch.types.hris.company import Company
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_directory.py b/tests/api_resources/hris/test_directory.py
index 5822d710..e8d9603b 100644
--- a/tests/api_resources/hris/test_directory.py
+++ b/tests/api_resources/hris/test_directory.py
@@ -10,7 +10,7 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncIndividualsPage, AsyncIndividualsPage
-from finch.types.hris import IndividualInDirectory
+from finch.types.hris.individual_in_directory import IndividualInDirectory
 
 # pyright: reportDeprecated=false
 
diff --git a/tests/api_resources/hris/test_employments.py b/tests/api_resources/hris/test_employments.py
index d228f309..433b8f5e 100644
--- a/tests/api_resources/hris/test_employments.py
+++ b/tests/api_resources/hris/test_employments.py
@@ -10,7 +10,7 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncResponsesPage, AsyncResponsesPage
-from finch.types.hris import EmploymentDataResponse
+from finch.types.hris.employment_data_response import EmploymentDataResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_individuals.py b/tests/api_resources/hris/test_individuals.py
index f34d10fb..6558eafe 100644
--- a/tests/api_resources/hris/test_individuals.py
+++ b/tests/api_resources/hris/test_individuals.py
@@ -10,7 +10,7 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncResponsesPage, AsyncResponsesPage
-from finch.types.hris import IndividualResponse
+from finch.types.hris.individual_response import IndividualResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_pay_statements.py b/tests/api_resources/hris/test_pay_statements.py
index b52cc2b7..3d77abdf 100644
--- a/tests/api_resources/hris/test_pay_statements.py
+++ b/tests/api_resources/hris/test_pay_statements.py
@@ -10,7 +10,7 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncResponsesPage, AsyncResponsesPage
-from finch.types.hris import PayStatementResponse
+from finch.types.hris.pay_statement_response import PayStatementResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/hris/test_payments.py b/tests/api_resources/hris/test_payments.py
index 70b183ea..4d421368 100644
--- a/tests/api_resources/hris/test_payments.py
+++ b/tests/api_resources/hris/test_payments.py
@@ -11,7 +11,7 @@
 from tests.utils import assert_matches_type
 from finch._utils import parse_date
 from finch.pagination import SyncSinglePage, AsyncSinglePage
-from finch.types.hris import Payment
+from finch.types.hris.payment import Payment
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/jobs/test_automated.py b/tests/api_resources/jobs/test_automated.py
index 5cf5644a..632d4051 100644
--- a/tests/api_resources/jobs/test_automated.py
+++ b/tests/api_resources/jobs/test_automated.py
@@ -10,7 +10,8 @@
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
 from finch.pagination import SyncPage, AsyncPage
-from finch.types.jobs import AutomatedAsyncJob, AutomatedCreateResponse
+from finch.types.jobs.automated_async_job import AutomatedAsyncJob
+from finch.types.jobs.automated_create_response import AutomatedCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/jobs/test_manual.py b/tests/api_resources/jobs/test_manual.py
index ec6d528a..71d2cc4a 100644
--- a/tests/api_resources/jobs/test_manual.py
+++ b/tests/api_resources/jobs/test_manual.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.jobs import ManualAsyncJob
+from finch.types.jobs.manual_async_job import ManualAsyncJob
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/connections/test_accounts.py b/tests/api_resources/sandbox/connections/test_accounts.py
index 82058694..16dfd79e 100644
--- a/tests/api_resources/sandbox/connections/test_accounts.py
+++ b/tests/api_resources/sandbox/connections/test_accounts.py
@@ -9,10 +9,8 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox.connections import (
-    AccountCreateResponse,
-    AccountUpdateResponse,
-)
+from finch.types.sandbox.connections.account_create_response import AccountCreateResponse
+from finch.types.sandbox.connections.account_update_response import AccountUpdateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/jobs/test_configuration.py b/tests/api_resources/sandbox/jobs/test_configuration.py
index b7d8ac2c..34503f42 100644
--- a/tests/api_resources/sandbox/jobs/test_configuration.py
+++ b/tests/api_resources/sandbox/jobs/test_configuration.py
@@ -9,7 +9,8 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox.jobs import SandboxJobConfiguration, ConfigurationRetrieveResponse
+from finch.types.sandbox.jobs.sandbox_job_configuration import SandboxJobConfiguration
+from finch.types.sandbox.jobs.configuration_retrieve_response import ConfigurationRetrieveResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_company.py b/tests/api_resources/sandbox/test_company.py
index 4104eb8a..c1d549a1 100644
--- a/tests/api_resources/sandbox/test_company.py
+++ b/tests/api_resources/sandbox/test_company.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import CompanyUpdateResponse
+from finch.types.sandbox.company_update_response import CompanyUpdateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_connections.py b/tests/api_resources/sandbox/test_connections.py
index 2cbb0fe0..e7590976 100644
--- a/tests/api_resources/sandbox/test_connections.py
+++ b/tests/api_resources/sandbox/test_connections.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import ConnectionCreateResponse
+from finch.types.sandbox.connection_create_response import ConnectionCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_directory.py b/tests/api_resources/sandbox/test_directory.py
index a42d4fcb..65a1644c 100644
--- a/tests/api_resources/sandbox/test_directory.py
+++ b/tests/api_resources/sandbox/test_directory.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import DirectoryCreateResponse
+from finch.types.sandbox.directory_create_response import DirectoryCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_employment.py b/tests/api_resources/sandbox/test_employment.py
index 7183dac5..59d8d2d1 100644
--- a/tests/api_resources/sandbox/test_employment.py
+++ b/tests/api_resources/sandbox/test_employment.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import EmploymentUpdateResponse
+from finch.types.sandbox.employment_update_response import EmploymentUpdateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_individual.py b/tests/api_resources/sandbox/test_individual.py
index 5d8f0683..bcce58fc 100644
--- a/tests/api_resources/sandbox/test_individual.py
+++ b/tests/api_resources/sandbox/test_individual.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import IndividualUpdateResponse
+from finch.types.sandbox.individual_update_response import IndividualUpdateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_jobs.py b/tests/api_resources/sandbox/test_jobs.py
index fd990987..33d105cb 100644
--- a/tests/api_resources/sandbox/test_jobs.py
+++ b/tests/api_resources/sandbox/test_jobs.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import JobCreateResponse
+from finch.types.sandbox.job_create_response import JobCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/sandbox/test_payment.py b/tests/api_resources/sandbox/test_payment.py
index 9b0c803a..39bb7873 100644
--- a/tests/api_resources/sandbox/test_payment.py
+++ b/tests/api_resources/sandbox/test_payment.py
@@ -9,7 +9,7 @@
 
 from finch import Finch, AsyncFinch
 from tests.utils import assert_matches_type
-from finch.types.sandbox import PaymentCreateResponse
+from finch.types.sandbox.payment_create_response import PaymentCreateResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_access_tokens.py b/tests/api_resources/test_access_tokens.py
index 3dcbe2e3..3b5da120 100644
--- a/tests/api_resources/test_access_tokens.py
+++ b/tests/api_resources/test_access_tokens.py
@@ -8,8 +8,8 @@
 import pytest
 
 from finch import Finch, AsyncFinch
-from finch.types import CreateAccessTokenResponse
 from tests.utils import assert_matches_type
+from finch.types.create_access_token_response import CreateAccessTokenResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_account.py b/tests/api_resources/test_account.py
index 2464a527..5addd4b6 100644
--- a/tests/api_resources/test_account.py
+++ b/tests/api_resources/test_account.py
@@ -8,8 +8,9 @@
 import pytest
 
 from finch import Finch, AsyncFinch
-from finch.types import Introspection, DisconnectResponse
 from tests.utils import assert_matches_type
+from finch.types.introspection import Introspection
+from finch.types.disconnect_response import DisconnectResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_providers.py b/tests/api_resources/test_providers.py
index 380fdf9c..4985d486 100644
--- a/tests/api_resources/test_providers.py
+++ b/tests/api_resources/test_providers.py
@@ -8,9 +8,9 @@
 import pytest
 
 from finch import Finch, AsyncFinch
-from finch.types import Provider
 from tests.utils import assert_matches_type
 from finch.pagination import SyncSinglePage, AsyncSinglePage
+from finch.types.provider import Provider
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 
diff --git a/tests/api_resources/test_request_forwarding.py b/tests/api_resources/test_request_forwarding.py
index ea0c6319..0a1758f5 100644
--- a/tests/api_resources/test_request_forwarding.py
+++ b/tests/api_resources/test_request_forwarding.py
@@ -8,8 +8,8 @@
 import pytest
 
 from finch import Finch, AsyncFinch
-from finch.types import RequestForwardingForwardResponse
 from tests.utils import assert_matches_type
+from finch.types.request_forwarding_forward_response import RequestForwardingForwardResponse
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")