diff --git a/hypha/apply/dashboard/tests/test_views.py b/hypha/apply/dashboard/tests/test_views.py
index 493c870c7038d32372624f25d0f710c3f7962c51..028475c986f8a153cc9391c71fb7ece2ed4a2884 100644
--- a/hypha/apply/dashboard/tests/test_views.py
+++ b/hypha/apply/dashboard/tests/test_views.py
@@ -3,14 +3,14 @@ from hypha.apply.funds.tests.factories import (
     ApplicationSubmissionFactory,
     InvitedToProposalFactory,
 )
-from hypha.apply.projects.models import (
+from hypha.apply.projects.models.payment import (
     CHANGES_REQUESTED,
-    COMMITTED,
     DECLINED,
     PAID,
     SUBMITTED,
     UNDER_REVIEW,
 )
+from hypha.apply.projects.models.project import COMMITTED
 from hypha.apply.projects.tests.factories import PaymentRequestFactory, ProjectFactory
 from hypha.apply.review.tests.factories import ReviewFactory, ReviewOpinionFactory
 from hypha.apply.users.groups import APPROVER_GROUP_NAME
diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py
index 6a8251cfa4a22c9bee49bc93b3502a1a93a2e343..949cbdca401cf7c7f8e79093c2662475016fee1d 100644
--- a/hypha/apply/projects/tests/factories.py
+++ b/hypha/apply/projects/tests/factories.py
@@ -7,25 +7,23 @@ from dateutil.relativedelta import relativedelta
 from django.utils import timezone
 
 from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory
-from hypha.apply.projects.models import (
+from hypha.apply.stream_forms.testing.factories import (
+    FormDataFactory,
+    FormFieldsBlockFactory,
+)
+from hypha.apply.users.tests.factories import StaffFactory, UserFactory
+
+from ..models.payment import PaymentReceipt, PaymentRequest
+from ..models.project import (
     COMPLETE,
     IN_PROGRESS,
     Contract,
     DocumentCategory,
     PacketFile,
-    PaymentReceipt,
-    PaymentRequest,
     Project,
     ProjectApprovalForm,
-    Report,
-    ReportConfig,
-    ReportVersion,
 )
-from hypha.apply.stream_forms.testing.factories import (
-    FormDataFactory,
-    FormFieldsBlockFactory,
-)
-from hypha.apply.users.tests.factories import StaffFactory, UserFactory
+from ..models.report import Report, ReportConfig, ReportVersion
 
 ADDRESS = {
     'country': 'GB',
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index 3ea639bb4db08c39eb4652ccbccee168196fa765..8aa146e3d126025a35c28522b503a7e9f16e4138 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -17,7 +17,7 @@ from ..forms import (
     filter_choices,
     filter_request_choices,
 )
-from ..models import CHANGES_REQUESTED, DECLINED, PAID, SUBMITTED, UNDER_REVIEW
+from ..models.payment import CHANGES_REQUESTED, DECLINED, PAID, SUBMITTED, UNDER_REVIEW
 from .factories import (
     DocumentCategoryFactory,
     PaymentRequestFactory,
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index df06a56d5bc6e4565c3a5eba7493056575d7e219..c2428f864c8d1aba180be1281c81f2d337b76b7f 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -7,17 +7,16 @@ from django.utils import timezone
 from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory
 from hypha.apply.users.tests.factories import ApplicantFactory, StaffFactory
 
-from ..models import (
+from ..models.payment import (
     CHANGES_REQUESTED,
     DECLINED,
     PAID,
     SUBMITTED,
     UNDER_REVIEW,
     PaymentRequest,
-    Project,
-    Report,
-    ReportConfig,
 )
+from ..models.project import Project
+from ..models.report import Report, ReportConfig
 from .factories import (
     DocumentCategoryFactory,
     PacketFileFactory,
diff --git a/hypha/apply/projects/tests/test_templatetags.py b/hypha/apply/projects/tests/test_templatetags.py
index 50cf3f09b79f6993f82771da06d304cd347bd40e..22d777158e94e64cc0f7627b6a1de9abf48d0c0e 100644
--- a/hypha/apply/projects/tests/test_templatetags.py
+++ b/hypha/apply/projects/tests/test_templatetags.py
@@ -2,18 +2,8 @@ from django.test import TestCase
 
 from hypha.apply.users.tests.factories import ApplicantFactory, StaffFactory
 
-from ..models import (
-    CHANGES_REQUESTED,
-    CLOSING,
-    COMMITTED,
-    COMPLETE,
-    CONTRACTING,
-    DECLINED,
-    IN_PROGRESS,
-    PAID,
-    SUBMITTED,
-    UNDER_REVIEW,
-)
+from ..models.payment import CHANGES_REQUESTED, DECLINED, PAID, SUBMITTED, UNDER_REVIEW
+from ..models.project import CLOSING, COMMITTED, COMPLETE, CONTRACTING, IN_PROGRESS
 from ..templatetags.contract_tools import user_can_upload_contract
 from ..templatetags.payment_request_tools import can_change_status, can_delete, can_edit
 from .factories import ContractFactory, PaymentRequestFactory, ProjectFactory
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index e26cbcd3d50ec052daaf753faf3f98b7a3ac8fdc..12d87ef265c7ed142a4d893b46916124e1cb2ff1 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -21,7 +21,8 @@ from hypha.apply.utils.testing.tests import BaseViewTestCase
 
 from ..files import get_files
 from ..forms import SetPendingForm
-from ..models import CHANGES_REQUESTED, COMMITTED, CONTRACTING, IN_PROGRESS, SUBMITTED
+from ..models.payment import CHANGES_REQUESTED, SUBMITTED
+from ..models.project import COMMITTED, CONTRACTING, IN_PROGRESS
 from ..views import ContractsMixin, ProjectDetailSimplifiedView
 from .factories import (
     ContractFactory,