diff --git a/src/blueprints/Devices.py b/src/blueprints/Devices.py
index 370884eb6698e890a8bb7077f150a60b1d87db59..4b8520da1b49596b2447816144547fa42c0b01d4 100644
--- a/src/blueprints/Devices.py
+++ b/src/blueprints/Devices.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify
 
-from logic.Database import Database
+from logic.database.Database import Database
 
 
 def construct_blueprint(settings):
diff --git a/src/blueprints/Measurements.py b/src/blueprints/Measurements.py
index fe9cae4afcfbd49376385e457e404af08fdc85eb..932d9fa2da6357e546128774d6a4d6b8e551d5c1 100644
--- a/src/blueprints/Measurements.py
+++ b/src/blueprints/Measurements.py
@@ -3,7 +3,7 @@ from typing import Dict
 from flask import Blueprint, jsonify, request
 
 from logic.AuthenticationWrapper import require_api_key
-from logic.Database import Database
+from logic.database.Database import Database
 from logic.Parameters import DeviceParameters, SensorParameters
 from logic.RequestValidator import RequestValidator, ValidationError
 
diff --git a/src/blueprints/Sensors.py b/src/blueprints/Sensors.py
index 34cff35c5d210d46bca90ca9ae0be9b7e8ae7cf7..e9e9f9700498e695733af16f9b261d2eb1d74213 100644
--- a/src/blueprints/Sensors.py
+++ b/src/blueprints/Sensors.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify
 
-from logic.Database import Database
+from logic.database.Database import Database
 
 
 def construct_blueprint(settings):
diff --git a/src/logic/Database.py b/src/logic/database/Database.py
similarity index 79%
rename from src/logic/Database.py
rename to src/logic/database/Database.py
index 2951ce23313eca82fdce8d332e584b957fb7de0a..f1cd645bc0e2f44a4d0bcc04102534e76eb3a144 100644
--- a/src/logic/Database.py
+++ b/src/logic/database/Database.py
@@ -1,11 +1,9 @@
-from enum import Enum
-
 from TheCodeLabs_BaseUtils import DefaultLogger
 
 from logic import Constants
-from logic.DeviceAccess import DeviceAccess
-from logic.MeasurementAccess import MeasurementAccess
-from logic.SensorAccess import SensorAccess
+from logic.database.DeviceAccess import DeviceAccess
+from logic.database.MeasurementAccess import MeasurementAccess
+from logic.database.SensorAccess import SensorAccess
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
 
diff --git a/src/logic/DatabaseAccess.py b/src/logic/database/DatabaseAccess.py
similarity index 100%
rename from src/logic/DatabaseAccess.py
rename to src/logic/database/DatabaseAccess.py
diff --git a/src/logic/DeviceAccess.py b/src/logic/database/DeviceAccess.py
similarity index 94%
rename from src/logic/DeviceAccess.py
rename to src/logic/database/DeviceAccess.py
index 8be7f86efd9b1e823d22ee0ca1bbd0284d8cedd2..f42517e0c0be6baed34d19a73f385b141b0a41f5 100644
--- a/src/logic/DeviceAccess.py
+++ b/src/logic/database/DeviceAccess.py
@@ -3,7 +3,7 @@ from typing import Dict, List
 from TheCodeLabs_BaseUtils import DefaultLogger
 
 from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
 
diff --git a/src/logic/MeasurementAccess.py b/src/logic/database/MeasurementAccess.py
similarity index 97%
rename from src/logic/MeasurementAccess.py
rename to src/logic/database/MeasurementAccess.py
index d156a3c0a86be7ca6b2011216ab2f74abd471aa0..0ff97c5611860370d30d3ca8434fd713ee2e9e03 100644
--- a/src/logic/MeasurementAccess.py
+++ b/src/logic/database/MeasurementAccess.py
@@ -4,7 +4,7 @@ from typing import Dict, List
 from TheCodeLabs_BaseUtils import DefaultLogger
 
 from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
 
diff --git a/src/logic/SensorAccess.py b/src/logic/database/SensorAccess.py
similarity index 96%
rename from src/logic/SensorAccess.py
rename to src/logic/database/SensorAccess.py
index 59cedfd7d05137f410b78d6b0bec2f7048df002a..68b3f90f2f5b63f050451459715fbe8bf33dce28 100644
--- a/src/logic/SensorAccess.py
+++ b/src/logic/database/SensorAccess.py
@@ -3,7 +3,7 @@ from typing import Dict, List
 from TheCodeLabs_BaseUtils import DefaultLogger
 
 from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
 
diff --git a/src/logic/database/__init__.py b/src/logic/database/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391