diff --git a/monkey/monkey_island/cc/dal/IAgentRepository.py b/monkey/monkey_island/cc/repository/IAgentRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IAgentRepository.py
rename to monkey/monkey_island/cc/repository/IAgentRepository.py
diff --git a/monkey/monkey_island/cc/dal/IAttackRepository.py b/monkey/monkey_island/cc/repository/IAttackRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IAttackRepository.py
rename to monkey/monkey_island/cc/repository/IAttackRepository.py
diff --git a/monkey/monkey_island/cc/dal/IConfigRepository.py b/monkey/monkey_island/cc/repository/IConfigRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IConfigRepository.py
rename to monkey/monkey_island/cc/repository/IConfigRepository.py
diff --git a/monkey/monkey_island/cc/dal/IEdgeRepository.py b/monkey/monkey_island/cc/repository/IEdgeRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IEdgeRepository.py
rename to monkey/monkey_island/cc/repository/IEdgeRepository.py
diff --git a/monkey/monkey_island/cc/dal/ILogRepository.py b/monkey/monkey_island/cc/repository/ILogRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ILogRepository.py
rename to monkey/monkey_island/cc/repository/ILogRepository.py
diff --git a/monkey/monkey_island/cc/dal/IMachineRepository.py b/monkey/monkey_island/cc/repository/IMachineRepository.py
similarity index 85%
rename from monkey/monkey_island/cc/dal/IMachineRepository.py
rename to monkey/monkey_island/cc/repository/IMachineRepository.py
index 99e7f49dc..da2526507 100644
--- a/monkey/monkey_island/cc/dal/IMachineRepository.py
+++ b/monkey/monkey_island/cc/repository/IMachineRepository.py
@@ -9,6 +9,7 @@ class IMachineRepository(ABC):
 
     # TODO define Machine object(ORM model)
     # TODO define or re-use machine state.
+    # TODO investigate where should the state be stored in edge or both edge and machine
     def get_machines(
         self,
         id: Optional[str] = None,
diff --git a/monkey/monkey_island/cc/dal/IReportRepository.py b/monkey/monkey_island/cc/repository/IReportRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IReportRepository.py
rename to monkey/monkey_island/cc/repository/IReportRepository.py
diff --git a/monkey/monkey_island/cc/dal/ISimulationRepository.py b/monkey/monkey_island/cc/repository/ISimulationRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ISimulationRepository.py
rename to monkey/monkey_island/cc/repository/ISimulationRepository.py
diff --git a/monkey/monkey_island/cc/dal/IStolenCredentials.py b/monkey/monkey_island/cc/repository/IStolenCredentials.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/IStolenCredentials.py
rename to monkey/monkey_island/cc/repository/IStolenCredentials.py
diff --git a/monkey/monkey_island/cc/dal/ITelemStoreRepository.py b/monkey/monkey_island/cc/repository/ITelemStoreRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ITelemStoreRepository.py
rename to monkey/monkey_island/cc/repository/ITelemStoreRepository.py
diff --git a/monkey/monkey_island/cc/dal/ITelemetryRepository.py b/monkey/monkey_island/cc/repository/ITelemetryRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/ITelemetryRepository.py
rename to monkey/monkey_island/cc/repository/ITelemetryRepository.py
diff --git a/monkey/monkey_island/cc/dal/__init__.py b/monkey/monkey_island/cc/repository/__init__.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/__init__.py
rename to monkey/monkey_island/cc/repository/__init__.py
diff --git a/monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py b/monkey/monkey_island/cc/repository/attack/IMitigationsRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/attack/IMitigationsRepository.py
rename to monkey/monkey_island/cc/repository/attack/IMitigationsRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py b/monkey/monkey_island/cc/repository/zero_trust/IEventRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/IEventRepository.py
rename to monkey/monkey_island/cc/repository/zero_trust/IEventRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py b/monkey/monkey_island/cc/repository/zero_trust/IFindingRepository.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/IFindingRepository.py
rename to monkey/monkey_island/cc/repository/zero_trust/IFindingRepository.py
diff --git a/monkey/monkey_island/cc/dal/zero_trust/__init__.py b/monkey/monkey_island/cc/repository/zero_trust/__init__.py
similarity index 100%
rename from monkey/monkey_island/cc/dal/zero_trust/__init__.py
rename to monkey/monkey_island/cc/repository/zero_trust/__init__.py