diff --git a/src/Dependencies.py b/src/Dependencies.py
index 025d430515cac449ab4becc760fa07e9f5c41552..28a15d0f53797dee266ccf23eb1a04831001b218 100644
--- a/src/Dependencies.py
+++ b/src/Dependencies.py
@@ -5,7 +5,7 @@ from fastapi.security import APIKeyHeader
 from starlette.status import HTTP_403_FORBIDDEN
 
 from Settings import SETTINGS
-from logic.databaseNew.Database import SessionLocal
+from logic.database.Database import SessionLocal
 
 
 def get_database():
diff --git a/src/StorageLeaf.py b/src/StorageLeaf.py
index 8a2e7b6d42c65e77dc447b7e8bbde9314075e7d4..2652bb3d2966e9d3be0f8225cff2c7dc81128c3f 100644
--- a/src/StorageLeaf.py
+++ b/src/StorageLeaf.py
@@ -7,8 +7,8 @@ from starlette.responses import RedirectResponse
 
 from Settings import SETTINGS
 from logic import Constants
-from logic.databaseNew import Models, Schemas
-from logic.databaseNew.Database import engine
+from logic.database import Models, Schemas
+from logic.database.Database import engine
 from logic.routers import DeviceRouter
 from logic.routers import SensorRouter, MeasurementRouter
 
diff --git a/src/logic/databaseNew/Crud.py b/src/logic/database/Crud.py
similarity index 98%
rename from src/logic/databaseNew/Crud.py
rename to src/logic/database/Crud.py
index ecfb9c22a17d77d6d0e1b8cd4d1a938e5a2c0aa0..052f85d8609cd1d71d02da59ba50bbdae6b0f272 100644
--- a/src/logic/databaseNew/Crud.py
+++ b/src/logic/database/Crud.py
@@ -5,7 +5,7 @@ from sqlalchemy.orm import Session
 
 from Settings import SETTINGS
 from logic.BackupService import BackupService
-from logic.databaseNew import Models, Schemas
+from logic.database import Models, Schemas
 
 DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
 
diff --git a/src/logic/databaseNew/Database.py b/src/logic/database/Database.py
similarity index 100%
rename from src/logic/databaseNew/Database.py
rename to src/logic/database/Database.py
diff --git a/src/logic/databaseNew/Models.py b/src/logic/database/Models.py
similarity index 96%
rename from src/logic/databaseNew/Models.py
rename to src/logic/database/Models.py
index c6fb22b0c22ebb5315ae8511d9ca1cbf4a41b6f6..b019c5825c480f34d95785dd142de7b2d237acea 100644
--- a/src/logic/databaseNew/Models.py
+++ b/src/logic/database/Models.py
@@ -1,7 +1,7 @@
 from sqlalchemy import Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
 
-from logic.databaseNew.Database import Base
+from logic.database.Database import Base
 
 
 class Device(Base):
diff --git a/src/logic/databaseNew/Schemas.py b/src/logic/database/Schemas.py
similarity index 100%
rename from src/logic/databaseNew/Schemas.py
rename to src/logic/database/Schemas.py
diff --git a/src/logic/databaseNew/__init__.py b/src/logic/database/__init__.py
similarity index 100%
rename from src/logic/databaseNew/__init__.py
rename to src/logic/database/__init__.py
diff --git a/src/logic/routers/DeviceRouter.py b/src/logic/routers/DeviceRouter.py
index 29b0d412c0a3312bece4fb1f9e5d41c96c9dc98b..203ebc792417ef97a63a1d8a962016f744be7a38 100644
--- a/src/logic/routers/DeviceRouter.py
+++ b/src/logic/routers/DeviceRouter.py
@@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends
 from sqlalchemy.orm import Session
 
 from Dependencies import get_database, check_api_key
-from logic.databaseNew import Schemas, Crud
-from logic.databaseNew.Schemas import Status
+from logic.database import Schemas, Crud
+from logic.database.Schemas import Status
 
 router = APIRouter(
     prefix='/device',
diff --git a/src/logic/routers/MeasurementRouter.py b/src/logic/routers/MeasurementRouter.py
index 6684d1fb0829ea29b25728048b6d019d896ec27c..7a0193cb4d0077e39c2c070f60386be3c588b18e 100644
--- a/src/logic/routers/MeasurementRouter.py
+++ b/src/logic/routers/MeasurementRouter.py
@@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends, Query
 from sqlalchemy.orm import Session
 
 from Dependencies import get_database, check_api_key, START_DATE_TIME, END_DATE_TIME
-from logic.databaseNew import Schemas, Crud
-from logic.databaseNew.Schemas import Status, MinMax
+from logic.database import Schemas, Crud
+from logic.database.Schemas import Status, MinMax
 
 router = APIRouter(tags=['measurement'])
 
diff --git a/src/logic/routers/SensorRouter.py b/src/logic/routers/SensorRouter.py
index 66a5375c3fc55658f7cc9a2bd998c1122d1ce9cb..500bfc2713dc2bf71414919a19f5ffeffc0f5e1f 100644
--- a/src/logic/routers/SensorRouter.py
+++ b/src/logic/routers/SensorRouter.py
@@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends
 from sqlalchemy.orm import Session
 
 from Dependencies import get_database, check_api_key, START_DATE_TIME, END_DATE_TIME
-from logic.databaseNew import Schemas, Crud
-from logic.databaseNew.Schemas import Status
+from logic.database import Schemas, Crud
+from logic.database.Schemas import Status
 
 router = APIRouter(
     prefix='/sensor',