diff --git a/engine-api.py b/engine-api.py
index 14332e1058384da89ccb1beafcd5bbc58b343219..acf5961e7a1c3a6447716069d01b5f7bd68d4a79 100644
--- a/engine-api.py
+++ b/engine-api.py
@@ -41,7 +41,7 @@ from werkzeug.exceptions            import HTTPException, default_exceptions, Ab
 
 from modules.base.logger            import AuraLogger
 from modules.base.config            import AuraConfig
-from modules.database.model         import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
+from modules.base.models            import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
 
 
 
diff --git a/modules/database/model.py b/modules/base/models.py
similarity index 100%
rename from modules/database/model.py
rename to modules/base/models.py
diff --git a/modules/cli/padavan.py b/modules/cli/padavan.py
index 7ae71ed587b2ab5a151201a7366509def5ec339f..c27a267cd9f1cbd1b595cc8479027258039ec323 100644
--- a/modules/cli/padavan.py
+++ b/modules/cli/padavan.py
@@ -22,8 +22,7 @@ import json
 from modules.base.enum import RedisChannel
 from modules.base.utils import TerminalColors
 from modules.cli.redis.adapter import ClientRedisAdapter, ServerRedisAdapter
-from modules.cli.redis.messenger import RedisMessenger
-from modules.database.model import AuraDatabaseModel
+from modules.base.models import AuraDatabaseModel
 
 
 class Padavan:
diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index d4a5376cf5e88693aad63aaa03fcc90a9fc6015c..1c229206842fadf4274b4d3c1bfc15d3d270ea3a 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -28,7 +28,7 @@ from datetime import datetime
 
 from modules.base.enum import PlaylistType
 from modules.base.utils import SimpleUtil
-from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from modules.base.models import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
 from modules.scheduling.calender_fetcher import CalendarFetcher
 
 
diff --git a/modules/scheduling/scheduler.py b/modules/scheduling/scheduler.py
index 4fb178ea043625f97be2b5b079757bca99e396fc..f7095ddbae9dabe70feea8804e14068b9cef5865 100644
--- a/modules/scheduling/scheduler.py
+++ b/modules/scheduling/scheduler.py
@@ -30,7 +30,7 @@ import threading
 from operator import attrgetter
 from datetime import datetime, timedelta
 
-from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from modules.base.models import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
 from modules.base.exceptions import NoActiveScheduleException, NoActiveEntryException, LoadSourceException
 from modules.base.enum import Channel, ChannelType, TimerType, TransitionType, EntryQueueState, EntryPlayState
 from modules.base.utils import SimpleUtil, TerminalColors, EngineUtil
diff --git a/testing/connection_tester.py b/testing/connection_tester.py
index 5dd375b65d099aafe0c2b415c479f2140c6fda25..3b2e4cf04d80261159edbb77926192512676bc43 100644
--- a/testing/connection_tester.py
+++ b/testing/connection_tester.py
@@ -23,7 +23,6 @@ import urllib
 import json
 
 from modules.core.engine import SoundSystem
-#from modules.database.model import ScheduleEntry
 from modules.base.config import AuraConfig
 
 
diff --git a/testing/test.py b/testing/test.py
index 3b6e567db56b3af2aaaaa00049d341bfc0c83f02..b466adce1e305658259d9e0e3934665f351131c4 100644
--- a/testing/test.py
+++ b/testing/test.py
@@ -24,13 +24,10 @@ import validators
 
 from datetime import datetime
 
-# libraries.base
 from modules.base.logger import AuraLogger
 from modules.base.config import AuraConfig
-# libraries.database
-from modules.database.model import Schedule, TrackService
-# libraries.security
-# from libraries.security.user import AuraUser
+from modules.base.models import Schedule, TrackService
+
 
 # modules
 from modules.core.engine import SoundSystem
diff --git a/testing/tests.py b/testing/tests.py
index 52b1c97c54dde86e6a84020892e1be3420f58c4c..51bbab631da3ffe97322607280e84ebaf8bb4d49 100755
--- a/testing/tests.py
+++ b/testing/tests.py
@@ -26,7 +26,7 @@ import decimal
 
 from modules.core.engine import SoundSystem
 from modules.base.config import AuraConfig
-from modules.database.model import Schedule, ScheduleEntry
+from modules.base.models import Schedule, ScheduleEntry
 from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService
 
 def alchemyencoder(obj):