diff --git a/src/common/database/Factory.py b/src/common/database/Factory.py
index 4b46ed0b145878c703fececd9b68fef54cbf7001..27dec581862c1636ac04efd57e48178a304bbf3b 100644
--- a/src/common/database/Factory.py
+++ b/src/common/database/Factory.py
@@ -1,8 +1,8 @@
 import logging, os
 from enum import Enum
-from .api.Database import Database
-from .engines.inmemory.InMemoryDatabaseEngine import InMemoryDatabaseEngine
-from .engines.redis.RedisDatabaseEngine import RedisDatabaseEngine
+from common.database.api.Database import Database
+from common.database.engines.inmemory.InMemoryDatabaseEngine import InMemoryDatabaseEngine
+from common.database.engines.redis.RedisDatabaseEngine import RedisDatabaseEngine
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/src/common/database/api/entity/EntityAttributes.py b/src/common/database/api/entity/EntityAttributes.py
index 47642b823de3164db18667aa474a95aed84e730c..b3e553453f7ebdda9439c81e11e1833ab32f1e41 100644
--- a/src/common/database/api/entity/EntityAttributes.py
+++ b/src/common/database/api/entity/EntityAttributes.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 import copy
 from typing import Any, Dict, TYPE_CHECKING
-from ...engines._DatabaseEngine import _DatabaseEngine
-from .Tools import format_key
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.api.entity.Tools import format_key
 
 if TYPE_CHECKING:
-    from ._Entity import _Entity
+    from common.database.api.entity._Entity import _Entity
 
 class EntityAttributes:
     def __init__(self, parent : '_Entity', entity_key : str, validators : Dict, transcoders : Dict = {}):
diff --git a/src/common/database/api/entity/EntityCollection.py b/src/common/database/api/entity/EntityCollection.py
index 4f3ffae040767fd7ce0b45dbb52595b944c40a5c..ed155370b43a91c7d64c921433d65327733fba54 100644
--- a/src/common/database/api/entity/EntityCollection.py
+++ b/src/common/database/api/entity/EntityCollection.py
@@ -1,10 +1,10 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
-from ...engines._DatabaseEngine import _DatabaseEngine
-from .Tools import format_key
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.api.entity.Tools import format_key
 
 if TYPE_CHECKING:
-    from ._Entity import _Entity
+    from common.database.api.entity._Entity import _Entity
 
 class EntityCollection:
     def __init__(self, parent : '_Entity', entity_key : str):
diff --git a/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py b/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
index ba828d79e8ee569703162f621f0630dae68a07b4..80c1669c73f603ac1eb477d883196b144d1ea143 100644
--- a/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
+++ b/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
@@ -1,6 +1,6 @@
 import copy, logging, threading, uuid
 from typing import Dict, List, Set, Tuple, Union
-from .._DatabaseEngine import _DatabaseEngine
+from common.database.engines._DatabaseEngine import _DatabaseEngine
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/src/common/database/engines/redis/RedisDatabaseEngine.py b/src/common/database/engines/redis/RedisDatabaseEngine.py
index e8777796823424fc9fd37a691c0616f5915b3dfa..4e7e071040e3acd2bfe7d715e426c302b8dde1f7 100644
--- a/src/common/database/engines/redis/RedisDatabaseEngine.py
+++ b/src/common/database/engines/redis/RedisDatabaseEngine.py
@@ -1,8 +1,8 @@
 import os, uuid
 from typing import Dict, List, Set, Tuple
 from redis.client import Redis
-from .._DatabaseEngine import _DatabaseEngine
-from .Mutex import Mutex
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.engines.redis.Mutex import Mutex
 
 KEY_ENTIRE_DATABASE_LOCK = 'everything'