diff --git a/api.py b/api.py
index 84f42ddf4d0c798e2d01956df010eda873e53987..bdcfd578cce7d669d3e2e80990fbb153593128b4 100644
--- a/api.py
+++ b/api.py
@@ -44,7 +44,7 @@ from apispec_webframeworks.flask    import FlaskPlugin
 from werkzeug.exceptions            import HTTPException, default_exceptions, Aborter
 
 from libraries.base.logger          import AuraLogger
-from libraries.base.config          import AuraConfig
+from modules.base.config            import AuraConfig
 from libraries.database.broadcasts  import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
 
 
diff --git a/aura.py b/aura.py
index 0fe04a73686167f46f0eb3471a990f4ce4a877a3..27e5e40157530388ef2ad7c8b80e8958b1355f24 100755
--- a/aura.py
+++ b/aura.py
@@ -32,7 +32,7 @@ from flask_sqlalchemy import SQLAlchemy
 # from sqlalchemy.ext.declarative import declarative_base
 
 from libraries.base.logger import AuraLogger
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 
 # from modules.monitoring.diskspace_watcher import DiskSpaceWatcher
 
diff --git a/guru.py b/guru.py
index 290fb031796f9f34b90fc414c4f4848229fd7eda..afbae6229b4e4ae7a72d9d0bc786342427f5c5d6 100755
--- a/guru.py
+++ b/guru.py
@@ -34,7 +34,7 @@ from argparse import ArgumentParser
 # own libs
 from modules.cli_tool.padavan import Padavan
 from libraries.exceptions.auraexceptions import PlaylistException
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 
 
 class Guru():
diff --git a/libraries/base/logger.py b/libraries/base/logger.py
index b9d15e41a72125176ceff0de70b77a4426accdc5..ec02e00f89e49d35a0608ea6387c79a6f90db80c 100644
--- a/libraries/base/logger.py
+++ b/libraries/base/logger.py
@@ -20,7 +20,7 @@
 
 import logging
 
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 
 
 class AuraLogger():
diff --git a/libraries/database/broadcasts.py b/libraries/database/broadcasts.py
index 63950c8318d3b93b4a9f71c58299f2d12102252c..1f6aad43471bad93286f6380cb8df7e84cf41271 100644
--- a/libraries/database/broadcasts.py
+++ b/libraries/database/broadcasts.py
@@ -39,7 +39,7 @@ from sqlalchemy.orm                     import relationship
 from sqlalchemy                         import create_engine
 
 from libraries.enum.auraenumerations    import ScheduleEntryType
-from libraries.base.config              import AuraConfig
+from modules.base.config                import AuraConfig
 from modules.base.simpleutil            import SimpleUtil
 
 
diff --git a/libraries/base/config.py b/modules/base/config.py
similarity index 100%
rename from libraries/base/config.py
rename to modules/base/config.py
diff --git a/testing/connection_tester.py b/testing/connection_tester.py
index d946e656e73b9c48342ba8e8818f093f72f7b6e4..d508df7093e575feac42b0208f777c7e32373093 100644
--- a/testing/connection_tester.py
+++ b/testing/connection_tester.py
@@ -28,7 +28,7 @@ import json
 
 from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
 #from libraries.database.broadcasts import ScheduleEntry
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 
 
 # ------------------------------------------------------------------------------------------ #
diff --git a/testing/test.py b/testing/test.py
index adee128608c7f75b4fe10a4fa2903837dadc8714..3374253e8728a9865e212e748b986deeca7a2a0c 100644
--- a/testing/test.py
+++ b/testing/test.py
@@ -6,7 +6,7 @@ from datetime import datetime
 
 # libraries.base
 from libraries.base.logger import AuraLogger
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 # libraries.database
 from libraries.database.broadcasts import Schedule, TrackService
 # libraries.security
diff --git a/testing/tests.py b/testing/tests.py
index 42eef174946529135f8ab39d0a8b9c6e93bd3368..1e05f9548ddb04e1be82479f9e2ee624b0ec3d56 100755
--- a/testing/tests.py
+++ b/testing/tests.py
@@ -32,7 +32,7 @@ import decimal
 
 from modules.communication.liquidsoap.communicator import LiquidSoapCommunicator
 from modules.monitoring.diskspace_watcher import DiskSpaceWatcher
-from libraries.base.config import AuraConfig
+from modules.base.config import AuraConfig
 from libraries.database.broadcasts import Schedule, ScheduleEntry
 from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService