diff --git a/shared/dto/__init__.py b/shared/dto/__init__.py
deleted file mode 100644
index be1cd38..0000000
--- a/shared/dto/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Data transfer objects module content."""
-from __future__ import annotations
-
-from .angle import AngleData
-from .contact import ContactData
-from .distance import DistanceData
-from .framing import FramingData
-from .information_value import InformationValueData
-from .modality_color import ModalityColorData
-from .modality_depth import ModalityDepthData
-from .modality_lighting import ModalityLightingData
-from .model_data import ModelData
-from .point_of_view import PointOfViewData
-from .salience import SalienceData
-from .visual_syntax import VisualSyntaxData
diff --git a/shared/mongodb/classes/__init__.py b/shared/mongodb/classes/__init__.py
index af91d95..84090da 100755
--- a/shared/mongodb/classes/__init__.py
+++ b/shared/mongodb/classes/__init__.py
@@ -1 +1,13 @@
+from .angle import AngleData
+from .contact import ContactData
+from .distance import DistanceData
+from .framing import FramingData
+from .information_value import InformationValueData
+from .modality_color import ModalityColorData
+from .modality_depth import ModalityDepthData
+from .modality_lighting import ModalityLightingData
+from .model_data import ModelData
+from .point_of_view import PointOfViewData
+from .salience import SalienceData
 from .visual_communication import VisualCommunication
+from .visual_syntax import VisualSyntaxData
diff --git a/shared/dto/angle.py b/shared/mongodb/classes/angle.py
similarity index 99%
rename from shared/dto/angle.py
rename to shared/mongodb/classes/angle.py
index 5ce2ea0..12491da 100644
--- a/shared/dto/angle.py
+++ b/shared/mongodb/classes/angle.py
@@ -1,4 +1,5 @@
 """Definition of Angle data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
@@ -6,6 +7,7 @@ from .data_model import DataModel
 
 class AngleData(DataModel):
     """Angle data model."""
+
     high: float
     eye_level: float
     low: float
diff --git a/shared/dto/contact.py b/shared/mongodb/classes/contact.py
similarity index 99%
rename from shared/dto/contact.py
rename to shared/mongodb/classes/contact.py
index 9a5f1cd..fc08a0a 100644
--- a/shared/dto/contact.py
+++ b/shared/mongodb/classes/contact.py
@@ -1,4 +1,5 @@
 """Definition of ContactData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/data_model.py b/shared/mongodb/classes/data_model.py
similarity index 100%
rename from shared/dto/data_model.py
rename to shared/mongodb/classes/data_model.py
diff --git a/shared/dto/distance.py b/shared/mongodb/classes/distance.py
similarity index 99%
rename from shared/dto/distance.py
rename to shared/mongodb/classes/distance.py
index efd9461..0aebbe6 100644
--- a/shared/dto/distance.py
+++ b/shared/mongodb/classes/distance.py
@@ -1,4 +1,5 @@
 """Definition of DistanceData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/framing.py b/shared/mongodb/classes/framing.py
similarity index 99%
rename from shared/dto/framing.py
rename to shared/mongodb/classes/framing.py
index 2381ebc..eca22e3 100644
--- a/shared/dto/framing.py
+++ b/shared/mongodb/classes/framing.py
@@ -1,4 +1,5 @@
 """Definition of FramingData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/information_value.py b/shared/mongodb/classes/information_value.py
similarity index 99%
rename from shared/dto/information_value.py
rename to shared/mongodb/classes/information_value.py
index 45d10f3..fd4bf48 100644
--- a/shared/dto/information_value.py
+++ b/shared/mongodb/classes/information_value.py
@@ -1,4 +1,5 @@
 """Definition of InformationValueData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/modality_color.py b/shared/mongodb/classes/modality_color.py
similarity index 99%
rename from shared/dto/modality_color.py
rename to shared/mongodb/classes/modality_color.py
index a34d6be..458e568 100644
--- a/shared/dto/modality_color.py
+++ b/shared/mongodb/classes/modality_color.py
@@ -1,4 +1,5 @@
 """Definition of ModalityColorData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/modality_depth.py b/shared/mongodb/classes/modality_depth.py
similarity index 99%
rename from shared/dto/modality_depth.py
rename to shared/mongodb/classes/modality_depth.py
index 3f8fbe6..e0446f4 100644
--- a/shared/dto/modality_depth.py
+++ b/shared/mongodb/classes/modality_depth.py
@@ -1,4 +1,5 @@
 """Definition of ModalityDepthData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/modality_lighting.py b/shared/mongodb/classes/modality_lighting.py
similarity index 99%
rename from shared/dto/modality_lighting.py
rename to shared/mongodb/classes/modality_lighting.py
index fb04f4c..508ad57 100644
--- a/shared/dto/modality_lighting.py
+++ b/shared/mongodb/classes/modality_lighting.py
@@ -1,4 +1,5 @@
 """Definition of ModalityLightingData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/model_data.py b/shared/mongodb/classes/model_data.py
similarity index 100%
rename from shared/dto/model_data.py
rename to shared/mongodb/classes/model_data.py
diff --git a/shared/dto/point_of_view.py b/shared/mongodb/classes/point_of_view.py
similarity index 99%
rename from shared/dto/point_of_view.py
rename to shared/mongodb/classes/point_of_view.py
index 98d67c5..b1e4543 100644
--- a/shared/dto/point_of_view.py
+++ b/shared/mongodb/classes/point_of_view.py
@@ -1,4 +1,5 @@
 """Definition of PointOfViewData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/salience.py b/shared/mongodb/classes/salience.py
similarity index 99%
rename from shared/dto/salience.py
rename to shared/mongodb/classes/salience.py
index 580100d..186132c 100644
--- a/shared/dto/salience.py
+++ b/shared/mongodb/classes/salience.py
@@ -1,4 +1,5 @@
 """Definition of SalienceData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel
diff --git a/shared/dto/visual_syntax.py b/shared/mongodb/classes/visual_syntax.py
similarity index 99%
rename from shared/dto/visual_syntax.py
rename to shared/mongodb/classes/visual_syntax.py
index fd38639..4483e7f 100644
--- a/shared/dto/visual_syntax.py
+++ b/shared/mongodb/classes/visual_syntax.py
@@ -1,4 +1,5 @@
 """Definition of VisualSyntaxData data model."""
+
 from __future__ import annotations
 
 from .data_model import DataModel