diff --git a/src/finch/types/ats/application.py b/src/finch/types/ats/application.py
index 7cca091d..10c17932 100644
--- a/src/finch/types/ats/application.py
+++ b/src/finch/types/ats/application.py
@@ -3,8 +3,8 @@
 from typing import Optional
 from datetime import datetime
 
+from .stage import Stage
 from ..._models import BaseModel
-from ...types.ats.stage import Stage
 
 __all__ = ["Application", "RejectedReason"]
 
diff --git a/src/finch/types/hris/benefits/individual_benefit.py b/src/finch/types/hris/benefits/individual_benefit.py
index e549e80a..e2e732bd 100644
--- a/src/finch/types/hris/benefits/individual_benefit.py
+++ b/src/finch/types/hris/benefits/individual_benefit.py
@@ -4,7 +4,7 @@
 from typing_extensions import Literal
 
 from ...._models import BaseModel
-from ....types.hris import benfit_contribution
+from ..benfit_contribution import BenfitContribution
 
 __all__ = ["IndividualBenefit", "Body"]
 
@@ -21,9 +21,9 @@ class Body(BaseModel):
     for this individual.
     """
 
-    company_contribution: Optional[benfit_contribution.BenfitContribution]
+    company_contribution: Optional[BenfitContribution]
 
-    employee_deduction: Optional[benfit_contribution.BenfitContribution]
+    employee_deduction: Optional[BenfitContribution]
 
     hsa_contribution_limit: Optional[Literal["individual", "family"]]
     """Type for HSA contribution limit if the benefit is a HSA."""
diff --git a/src/finch/types/hris/company.py b/src/finch/types/hris/company.py
index de5f34cd..848bc6c1 100644
--- a/src/finch/types/hris/company.py
+++ b/src/finch/types/hris/company.py
@@ -3,8 +3,8 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from ...types import location
 from ..._models import BaseModel
+from ..location import Location
 
 __all__ = ["Company", "Account", "Department", "DepartmentParent", "Entity"]
 
@@ -69,7 +69,7 @@ class Company(BaseModel):
     legal_name: Optional[str]
     """The legal name of the company."""
 
-    locations: Optional[List[Optional[location.Location]]]
+    locations: Optional[List[Optional[Location]]]
 
     primary_email: Optional[str]
     """The email of the main administrator on the account."""
diff --git a/src/finch/types/hris/company_benefit.py b/src/finch/types/hris/company_benefit.py
index aa60bff7..c2d24202 100644
--- a/src/finch/types/hris/company_benefit.py
+++ b/src/finch/types/hris/company_benefit.py
@@ -3,7 +3,9 @@
 from typing import Optional
 
 from ..._models import BaseModel
-from ...types.hris import benefit_type, benefit_frequency, benfit_contribution
+from .benefit_type import BenefitType
+from .benefit_frequency import BenefitFrequency
+from .benfit_contribution import BenfitContribution
 
 __all__ = ["CompanyBenefit"]
 
@@ -11,13 +13,13 @@
 class CompanyBenefit(BaseModel):
     benefit_id: str
 
-    company_contribution: Optional[benfit_contribution.BenfitContribution]
+    company_contribution: Optional[BenfitContribution]
 
     description: Optional[str]
 
-    employee_deduction: Optional[benfit_contribution.BenfitContribution]
+    employee_deduction: Optional[BenfitContribution]
 
-    frequency: Optional[benefit_frequency.BenefitFrequency]
+    frequency: Optional[BenefitFrequency]
 
-    type: Optional[benefit_type.BenefitType]
+    type: Optional[BenefitType]
     """Type of benefit."""
diff --git a/src/finch/types/hris/individual.py b/src/finch/types/hris/individual.py
index df42d9a1..bc01047b 100644
--- a/src/finch/types/hris/individual.py
+++ b/src/finch/types/hris/individual.py
@@ -3,8 +3,8 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from ...types import location
 from ..._models import BaseModel
+from ..location import Location
 
 __all__ = ["Individual", "Email", "PhoneNumber"]
 
@@ -46,7 +46,7 @@ class Individual(BaseModel):
     preferred_name: Optional[str]
     """The preferred name of the individual."""
 
-    residence: Optional[location.Location]
+    residence: Optional[Location]
 
     ssn: Optional[str]
     """Note: This property is only available if enabled for your account.
diff --git a/src/finch/types/hris/individual_response.py b/src/finch/types/hris/individual_response.py
index 797e1523..baa2a9b9 100644
--- a/src/finch/types/hris/individual_response.py
+++ b/src/finch/types/hris/individual_response.py
@@ -3,13 +3,13 @@
 from typing import Optional
 
 from ..._models import BaseModel
-from ...types.hris import individual
+from .individual import Individual
 
 __all__ = ["IndividualResponse"]
 
 
 class IndividualResponse(BaseModel):
-    body: Optional[individual.Individual]
+    body: Optional[Individual]
 
     code: Optional[int]
 
diff --git a/src/finch/types/hris/individuals/employment_data.py b/src/finch/types/hris/individuals/employment_data.py
index 46f3b9de..ea6ed156 100644
--- a/src/finch/types/hris/individuals/employment_data.py
+++ b/src/finch/types/hris/individuals/employment_data.py
@@ -5,10 +5,9 @@
 
 from pydantic import Field as FieldInfo
 
-from ....types import income
+from ...income import Income
 from ...._models import BaseModel
-from ....types.income import Income
-from ....types.location import Location
+from ...location import Location
 
 __all__ = ["EmploymentData", "Department", "Employment", "Manager"]
 
@@ -53,7 +52,7 @@ class EmploymentData(BaseModel):
     first_name: Optional[str]
     """The legal first name of the individual."""
 
-    income_history: Optional[List[Optional[income.Income]]]
+    income_history: Optional[List[Optional[Income]]]
     """The array of income history."""
 
     income: Optional[Income]
diff --git a/src/finch/types/hris/individuals/employment_data_response.py b/src/finch/types/hris/individuals/employment_data_response.py
index de6369cd..e885d914 100644
--- a/src/finch/types/hris/individuals/employment_data_response.py
+++ b/src/finch/types/hris/individuals/employment_data_response.py
@@ -3,13 +3,13 @@
 from typing import Optional
 
 from ...._models import BaseModel
-from ....types.hris.individuals import employment_data
+from .employment_data import EmploymentData
 
 __all__ = ["EmploymentDataResponse"]
 
 
 class EmploymentDataResponse(BaseModel):
-    body: Optional[employment_data.EmploymentData]
+    body: Optional[EmploymentData]
 
     code: Optional[int]
 
diff --git a/src/finch/types/hris/pay_statement.py b/src/finch/types/hris/pay_statement.py
index 61f3cf29..02c1cb59 100644
--- a/src/finch/types/hris/pay_statement.py
+++ b/src/finch/types/hris/pay_statement.py
@@ -3,9 +3,9 @@
 from typing import List, Optional
 from typing_extensions import Literal
 
-from ...types import money
+from ..money import Money
 from ..._models import BaseModel
-from ...types.hris import benefit_type
+from .benefit_type import BenefitType
 
 __all__ = ["PayStatement", "Earning", "EmployeeDeduction", "EmployerContribution", "Tax"]
 
@@ -60,7 +60,7 @@ class EmployeeDeduction(BaseModel):
     pre_tax: Optional[bool]
     """Boolean indicating if the deduction is pre-tax."""
 
-    type: Optional[benefit_type.BenefitType]
+    type: Optional[BenefitType]
     """Type of benefit."""
 
 
@@ -74,7 +74,7 @@ class EmployerContribution(BaseModel):
     name: Optional[str]
     """The contribution name from the pay statement."""
 
-    type: Optional[benefit_type.BenefitType]
+    type: Optional[BenefitType]
     """Type of benefit."""
 
 
@@ -104,12 +104,12 @@ class PayStatement(BaseModel):
 
     employer_contributions: Optional[List[Optional[EmployerContribution]]]
 
-    gross_pay: Optional[money.Money]
+    gross_pay: Optional[Money]
 
     individual_id: Optional[str]
     """A stable Finch `id` (UUID v4) for an individual in the company"""
 
-    net_pay: Optional[money.Money]
+    net_pay: Optional[Money]
 
     payment_method: Optional[Literal["check", "direct_deposit"]]
     """The payment method."""
diff --git a/src/finch/types/hris/pay_statement_response.py b/src/finch/types/hris/pay_statement_response.py
index bae6937f..d759e05d 100644
--- a/src/finch/types/hris/pay_statement_response.py
+++ b/src/finch/types/hris/pay_statement_response.py
@@ -3,13 +3,13 @@
 from typing import Optional
 
 from ..._models import BaseModel
-from ...types.hris import pay_statement_response_body
+from .pay_statement_response_body import PayStatementResponseBody
 
 __all__ = ["PayStatementResponse"]
 
 
 class PayStatementResponse(BaseModel):
-    body: Optional[pay_statement_response_body.PayStatementResponseBody]
+    body: Optional[PayStatementResponseBody]
 
     code: Optional[int]
 
diff --git a/src/finch/types/hris/pay_statement_response_body.py b/src/finch/types/hris/pay_statement_response_body.py
index cac94b82..60640164 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 ..paging import Paging
 from ..._models import BaseModel
-from ...types.hris import pay_statement
-from ...types.paging import Paging
+from .pay_statement import PayStatement
 
 __all__ = ["PayStatementResponseBody"]
 
@@ -12,5 +12,5 @@
 class PayStatementResponseBody(BaseModel):
     paging: Optional[Paging]
 
-    pay_statements: Optional[List[pay_statement.PayStatement]]
+    pay_statements: Optional[List[PayStatement]]
     """The array of pay statements for the current payment."""
diff --git a/src/finch/types/hris/payment.py b/src/finch/types/hris/payment.py
index e5ea9810..d7072ab2 100644
--- a/src/finch/types/hris/payment.py
+++ b/src/finch/types/hris/payment.py
@@ -2,7 +2,7 @@
 
 from typing import List, Optional
 
-from ...types import money
+from ..money import Money
 from ..._models import BaseModel
 
 __all__ = ["Payment", "PayPeriod"]
@@ -18,20 +18,20 @@ class Payment(BaseModel):
     id: Optional[str]
     """The unique id for the payment."""
 
-    company_debit: Optional[money.Money]
+    company_debit: Optional[Money]
 
     debit_date: Optional[str]
 
-    employee_taxes: Optional[money.Money]
+    employee_taxes: Optional[Money]
 
-    employer_taxes: Optional[money.Money]
+    employer_taxes: Optional[Money]
 
-    gross_pay: Optional[money.Money]
+    gross_pay: Optional[Money]
 
     individual_ids: Optional[List[str]]
     """Array of every individual on this payment."""
 
-    net_pay: Optional[money.Money]
+    net_pay: Optional[Money]
 
     pay_date: Optional[str]
 
diff --git a/src/finch/types/hris/supported_benefit.py b/src/finch/types/hris/supported_benefit.py
index 52136220..15e01086 100644
--- a/src/finch/types/hris/supported_benefit.py
+++ b/src/finch/types/hris/supported_benefit.py
@@ -4,7 +4,7 @@
 from typing_extensions import Literal
 
 from ..._models import BaseModel
-from ...types.hris import benefit_type
+from .benefit_type import BenefitType
 
 __all__ = ["SupportedBenefit"]
 
@@ -43,5 +43,5 @@ class SupportedBenefit(BaseModel):
     values for HSA benefits.
     """
 
-    type: Optional[benefit_type.BenefitType]
+    type: Optional[BenefitType]
     """Type of benefit."""