diff --git a/shared/mongodb/__init__.py b/shared/mongodb/__init__.py
index 9550ad5..6ca8e30 100644
--- a/shared/mongodb/__init__.py
+++ b/shared/mongodb/__init__.py
@@ -1,7 +1,8 @@
-from .utils.connect_mongodb import connect_mongodb
-from .utils.count_documents import count_documents
-from .utils.get_visual_communication import get_visual_communication
-from .utils.list_names import list_names
-from .utils.upsert_annotation import upsert_annotation
-from .utils.upsert_prediction import upsert_prediction
-from .utils.upsert_visual_communication import upsert_visual_communication
+from .src import classes, exceptions
+from .src.connect_mongodb import connect_mongodb
+from .src.count_documents import count_documents
+from .src.get_visual_communication import get_visual_communication
+from .src.list_names import list_names
+from .src.upsert_annotation import upsert_annotation
+from .src.upsert_prediction import upsert_prediction
+from .src.upsert_visual_communication import upsert_visual_communication
diff --git a/shared/mongodb/utils/__init__.py b/shared/mongodb/src/__init__.py
similarity index 100%
rename from shared/mongodb/utils/__init__.py
rename to shared/mongodb/src/__init__.py
diff --git a/shared/mongodb/classes/__init__.py b/shared/mongodb/src/classes/__init__.py
similarity index 100%
rename from shared/mongodb/classes/__init__.py
rename to shared/mongodb/src/classes/__init__.py
diff --git a/shared/mongodb/classes/angle.py b/shared/mongodb/src/classes/angle.py
similarity index 100%
rename from shared/mongodb/classes/angle.py
rename to shared/mongodb/src/classes/angle.py
diff --git a/shared/mongodb/classes/contact.py b/shared/mongodb/src/classes/contact.py
similarity index 100%
rename from shared/mongodb/classes/contact.py
rename to shared/mongodb/src/classes/contact.py
diff --git a/shared/mongodb/classes/data_model.py b/shared/mongodb/src/classes/data_model.py
similarity index 100%
rename from shared/mongodb/classes/data_model.py
rename to shared/mongodb/src/classes/data_model.py
diff --git a/shared/mongodb/classes/distance.py b/shared/mongodb/src/classes/distance.py
similarity index 100%
rename from shared/mongodb/classes/distance.py
rename to shared/mongodb/src/classes/distance.py
diff --git a/shared/mongodb/classes/framing.py b/shared/mongodb/src/classes/framing.py
similarity index 100%
rename from shared/mongodb/classes/framing.py
rename to shared/mongodb/src/classes/framing.py
diff --git a/shared/mongodb/classes/information_value.py b/shared/mongodb/src/classes/information_value.py
similarity index 100%
rename from shared/mongodb/classes/information_value.py
rename to shared/mongodb/src/classes/information_value.py
diff --git a/shared/mongodb/classes/modality_color.py b/shared/mongodb/src/classes/modality_color.py
similarity index 100%
rename from shared/mongodb/classes/modality_color.py
rename to shared/mongodb/src/classes/modality_color.py
diff --git a/shared/mongodb/classes/modality_depth.py b/shared/mongodb/src/classes/modality_depth.py
similarity index 100%
rename from shared/mongodb/classes/modality_depth.py
rename to shared/mongodb/src/classes/modality_depth.py
diff --git a/shared/mongodb/classes/modality_lighting.py b/shared/mongodb/src/classes/modality_lighting.py
similarity index 100%
rename from shared/mongodb/classes/modality_lighting.py
rename to shared/mongodb/src/classes/modality_lighting.py
diff --git a/shared/mongodb/classes/model_data.py b/shared/mongodb/src/classes/model_data.py
similarity index 100%
rename from shared/mongodb/classes/model_data.py
rename to shared/mongodb/src/classes/model_data.py
diff --git a/shared/mongodb/classes/point_of_view.py b/shared/mongodb/src/classes/point_of_view.py
similarity index 100%
rename from shared/mongodb/classes/point_of_view.py
rename to shared/mongodb/src/classes/point_of_view.py
diff --git a/shared/mongodb/classes/salience.py b/shared/mongodb/src/classes/salience.py
similarity index 100%
rename from shared/mongodb/classes/salience.py
rename to shared/mongodb/src/classes/salience.py
diff --git a/shared/mongodb/classes/visual_communication.py b/shared/mongodb/src/classes/visual_communication.py
similarity index 100%
rename from shared/mongodb/classes/visual_communication.py
rename to shared/mongodb/src/classes/visual_communication.py
diff --git a/shared/mongodb/classes/visual_syntax.py b/shared/mongodb/src/classes/visual_syntax.py
similarity index 100%
rename from shared/mongodb/classes/visual_syntax.py
rename to shared/mongodb/src/classes/visual_syntax.py
diff --git a/shared/mongodb/utils/connect_mongodb.py b/shared/mongodb/src/connect_mongodb.py
similarity index 100%
rename from shared/mongodb/utils/connect_mongodb.py
rename to shared/mongodb/src/connect_mongodb.py
diff --git a/shared/mongodb/utils/count_documents.py b/shared/mongodb/src/count_documents.py
similarity index 100%
rename from shared/mongodb/utils/count_documents.py
rename to shared/mongodb/src/count_documents.py
diff --git a/shared/mongodb/exceptions/__init__.py b/shared/mongodb/src/exceptions/__init__.py
similarity index 100%
rename from shared/mongodb/exceptions/__init__.py
rename to shared/mongodb/src/exceptions/__init__.py
diff --git a/shared/mongodb/exceptions/no_document_found.py b/shared/mongodb/src/exceptions/no_document_found.py
similarity index 100%
rename from shared/mongodb/exceptions/no_document_found.py
rename to shared/mongodb/src/exceptions/no_document_found.py
diff --git a/shared/mongodb/utils/get_dataset.py b/shared/mongodb/src/get_dataset.py
similarity index 100%
rename from shared/mongodb/utils/get_dataset.py
rename to shared/mongodb/src/get_dataset.py
diff --git a/shared/mongodb/utils/get_visual_communication.py b/shared/mongodb/src/get_visual_communication.py
similarity index 100%
rename from shared/mongodb/utils/get_visual_communication.py
rename to shared/mongodb/src/get_visual_communication.py
diff --git a/shared/mongodb/utils/list_names.py b/shared/mongodb/src/list_names.py
similarity index 100%
rename from shared/mongodb/utils/list_names.py
rename to shared/mongodb/src/list_names.py
diff --git a/shared/mongodb/utils/upsert_annotation.py b/shared/mongodb/src/upsert_annotation.py
similarity index 100%
rename from shared/mongodb/utils/upsert_annotation.py
rename to shared/mongodb/src/upsert_annotation.py
diff --git a/shared/mongodb/utils/upsert_prediction.py b/shared/mongodb/src/upsert_prediction.py
similarity index 100%
rename from shared/mongodb/utils/upsert_prediction.py
rename to shared/mongodb/src/upsert_prediction.py
diff --git a/shared/mongodb/utils/upsert_visual_communication.py b/shared/mongodb/src/upsert_visual_communication.py
similarity index 100%
rename from shared/mongodb/utils/upsert_visual_communication.py
rename to shared/mongodb/src/upsert_visual_communication.py