diff --git a/engine-api.py b/engine-api.py
index 60af93da68d620d0b552e693328dd4c297cd52b8..0ee133581d69aaf284f57aa0221cfe8502bd6965 100644
--- a/engine-api.py
+++ b/engine-api.py
@@ -39,7 +39,7 @@ from werkzeug.exceptions            import HTTPException, default_exceptions, Ab
 
 from modules.base.logger            import AuraLogger
 from modules.base.config            import AuraConfig
-from libraries.database.broadcasts  import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
+from modules.database.model         import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
 
 
 
diff --git a/modules/cli_tool/padavan.py b/modules/cli_tool/padavan.py
index a81033f306358686ca74fdfa1991c6ece718d5d7..a96f515640dd50103968bf300453cd47a4a92c2b 100644
--- a/modules/cli_tool/padavan.py
+++ b/modules/cli_tool/padavan.py
@@ -28,7 +28,7 @@ from modules.base.enum import RedisChannel
 from modules.base.utils import TerminalColors
 from modules.communication.redis.adapter import ClientRedisAdapter, ServerRedisAdapter
 from modules.communication.redis.messenger import RedisMessenger
-from libraries.database.broadcasts import AuraDatabaseModel
+from modules.database.model import AuraDatabaseModel
 
 
 class Padavan:
diff --git a/modules/core/state.py b/modules/core/state.py
index c188695eca903a67ba34ac8ff63e7bcb88d78365..d7d5980f7e7a5624c0f37b71ea7324f6347fc717 100644
--- a/modules/core/state.py
+++ b/modules/core/state.py
@@ -23,7 +23,7 @@ from collections import deque
 
 from modules.base.exceptions        import NoActiveEntryException
 from modules.base.utils             import SimpleUtil
-from libraries.database.broadcasts  import SingleEntry, SingleEntryMetaData, PlaylistEntry, PlaylistEntryMetaData, TrackService
+from modules.database.model         import SingleEntry, SingleEntryMetaData, PlaylistEntry, PlaylistEntryMetaData, TrackService
 
 
 
diff --git a/libraries/database/broadcasts.py b/modules/database/model.py
similarity index 100%
rename from libraries/database/broadcasts.py
rename to modules/database/model.py
diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index 951c6d73c12889884f102561b67ee05bf05f7c2d..1c30905975997fd9adb5afd86f389c674ad2eec3 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -34,7 +34,7 @@ import logging
 from mutagen.flac import FLAC
 from datetime import datetime, timedelta
 
-from libraries.database.broadcasts import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
 from modules.communication.redis.messenger import RedisMessenger
 from modules.scheduling.calender_fetcher import CalendarFetcher
 
diff --git a/modules/scheduling/scheduler.py b/modules/scheduling/scheduler.py
index 912b8d7e142628a3e56cef19d4171901d23beb14..f8f422c3fa8cfa184a7578634c8bc675b07777be 100644
--- a/modules/scheduling/scheduler.py
+++ b/modules/scheduling/scheduler.py
@@ -34,7 +34,7 @@ import threading
 
 from operator import attrgetter
 
-from libraries.database.broadcasts import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, SingleEntry, SingleEntryMetaData, TrackService
+from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, SingleEntry, SingleEntryMetaData, TrackService
 
 from modules.base.exceptions import NoActiveScheduleException, NoActiveEntryException
 from modules.base.enum import Channel, ChannelType, TimerType, TransitionType, EntryQueueState
diff --git a/testing/connection_tester.py b/testing/connection_tester.py
index c156b7d22de7d6d831575ef78b9b25a37df06ee8..4ab6c17190647d40be4fe31c5178066cd491680a 100644
--- a/testing/connection_tester.py
+++ b/testing/connection_tester.py
@@ -27,7 +27,7 @@ import logging
 import json
 
 from modules.core.engine import SoundSystem
-#from libraries.database.broadcasts import ScheduleEntry
+#from modules.database.model import ScheduleEntry
 from modules.base.config import AuraConfig
 
 
diff --git a/testing/test.py b/testing/test.py
index 06e047ac94b5642d2579247b317654117c79e3c0..2dc9c7fe97af573470ac20acbabfa317a7ad0195 100644
--- a/testing/test.py
+++ b/testing/test.py
@@ -8,7 +8,7 @@ from datetime import datetime
 from modules.base.logger import AuraLogger
 from modules.base.config import AuraConfig
 # libraries.database
-from libraries.database.broadcasts import Schedule, TrackService
+from modules.database.model import Schedule, TrackService
 # libraries.security
 # from libraries.security.user import AuraUser
 
diff --git a/testing/tests.py b/testing/tests.py
index b69e64ff6629e44a41358f886aa33a0954beab3e..31f19763a266f5fbb1d65f2c369f49060e1502f7 100755
--- a/testing/tests.py
+++ b/testing/tests.py
@@ -24,7 +24,7 @@
 #  along with engine. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from libraries.database.broadcasts import *
+
 import json
 import logging
 import sqlalchemy
@@ -32,7 +32,7 @@ import decimal
 
 from modules.core.engine import SoundSystem
 from modules.base.config import AuraConfig
-from libraries.database.broadcasts import Schedule, ScheduleEntry
+from modules.database.model import Schedule, ScheduleEntry
 from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService
 
 def alchemyencoder(obj):