diff --git a/src/regtech_user_fi_management/entities/engine/__init__.py b/src/regtech_user_fi_management/entities/engine/__init__.py
index 1fa8193..e69de29 100644
--- a/src/regtech_user_fi_management/entities/engine/__init__.py
+++ b/src/regtech_user_fi_management/entities/engine/__init__.py
@@ -1,3 +0,0 @@
-__all__ = ["get_session"]
-
-from .engine import get_session
diff --git a/src/regtech_user_fi_management/entities/models/__init__.py b/src/regtech_user_fi_management/entities/models/__init__.py
index c043bea..e69de29 100644
--- a/src/regtech_user_fi_management/entities/models/__init__.py
+++ b/src/regtech_user_fi_management/entities/models/__init__.py
@@ -1,53 +0,0 @@
-__all__ = [
-    "Base",
-    "FinancialInstitutionDao",
-    "FinancialInstitutionDomainDao",
-    "FinancialInstitutionDto",
-    "FinancialInstitutionWithRelationsDto",
-    "FinancialInsitutionDomainDto",
-    "FinancialInsitutionDomainCreate",
-    "FinancialInstitutionAssociationDto",
-    "DeniedDomainDao",
-    "DeniedDomainDto",
-    "UserProfile",
-    "FederalRegulatorDao",
-    "HMDAInstitutionTypeDao",
-    "SBLInstitutionTypeDao",
-    "AddressStateDao",
-    "FederalRegulatorDto",
-    "InstitutionTypeDto",
-    "AddressStateDto",
-    "SblTypeMappingDao",
-    "SblTypeAssociationDto",
-    "SblTypeAssociationDetailsDto",
-    "SblTypeAssociationPatchDto",
-    "VersionedData",
-]
-
-from .dao import (
-    Base,
-    FinancialInstitutionDao,
-    FinancialInstitutionDomainDao,
-    DeniedDomainDao,
-    FederalRegulatorDao,
-    HMDAInstitutionTypeDao,
-    SBLInstitutionTypeDao,
-    AddressStateDao,
-    SblTypeMappingDao,
-)
-from .dto import (
-    FinancialInstitutionDto,
-    FinancialInstitutionWithRelationsDto,
-    FinancialInsitutionDomainDto,
-    FinancialInsitutionDomainCreate,
-    FinancialInstitutionAssociationDto,
-    DeniedDomainDto,
-    UserProfile,
-    FederalRegulatorDto,
-    InstitutionTypeDto,
-    AddressStateDto,
-    SblTypeAssociationDto,
-    SblTypeAssociationDetailsDto,
-    SblTypeAssociationPatchDto,
-    VersionedData,
-)
diff --git a/src/regtech_user_fi_management/entities/repos/institutions_repo.py b/src/regtech_user_fi_management/entities/repos/institutions_repo.py
index 4d8f28c..263332e 100644
--- a/src/regtech_user_fi_management/entities/repos/institutions_repo.py
+++ b/src/regtech_user_fi_management/entities/repos/institutions_repo.py
@@ -8,16 +8,19 @@
 
 from .repo_utils import get_associated_sbl_types, query_type
 
-from entities.models import (
+from regtech_user_fi_management.entities.models.dao import (
     FinancialInstitutionDao,
     FinancialInstitutionDomainDao,
-    FinancialInstitutionDto,
-    FinancialInsitutionDomainCreate,
     HMDAInstitutionTypeDao,
     SBLInstitutionTypeDao,
     DeniedDomainDao,
     AddressStateDao,
     FederalRegulatorDao,
+)
+
+from regtech_user_fi_management.entities.models.dto import (
+    FinancialInstitutionDto,
+    FinancialInsitutionDomainCreate,
     SblTypeAssociationDto,
 )
 
diff --git a/src/regtech_user_fi_management/entities/repos/repo_utils.py b/src/regtech_user_fi_management/entities/repos/repo_utils.py
index 15c4b11..0ad6c28 100644
--- a/src/regtech_user_fi_management/entities/repos/repo_utils.py
+++ b/src/regtech_user_fi_management/entities/repos/repo_utils.py
@@ -1,7 +1,8 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 from typing import Sequence, TypeVar, Type
-from entities.models import Base, SblTypeMappingDao, SblTypeAssociationDto
+from regtech_user_fi_management.entities.models.dao import Base, SblTypeMappingDao
+from regtech_user_fi_management.entities.models.dto import SblTypeAssociationDto
 
 T = TypeVar("T", bound=Base)
 
diff --git a/src/regtech_user_fi_management/main.py b/src/regtech_user_fi_management/main.py
index abe88bf..f3c44a7 100644
--- a/src/regtech_user_fi_management/main.py
+++ b/src/regtech_user_fi_management/main.py
@@ -9,14 +9,14 @@
 from starlette.middleware.authentication import AuthenticationMiddleware
 from alembic.config import Config
 from alembic import command
-from entities.listeners import setup_dao_listeners
-
-from routers import admin_router, institutions_router
 
 from regtech_api_commons.oauth2.oauth2_backend import BearerTokenAuthBackend
 from regtech_api_commons.oauth2.oauth2_admin import OAuth2Admin
 
-from config import kc_settings
+from regtech_user_fi_management.config import kc_settings
+from regtech_user_fi_management.entities.listeners import setup_dao_listeners
+from regtech_user_fi_management.routers import admin_router, institutions_router
+
 
 log = logging.getLogger()
 
diff --git a/src/regtech_user_fi_management/util/__init__.py b/src/regtech_user_fi_management/util/__init__.py
index 8b13789..e69de29 100644
--- a/src/regtech_user_fi_management/util/__init__.py
+++ b/src/regtech_user_fi_management/util/__init__.py
@@ -1 +0,0 @@
-