diff --git a/run.py b/run.py
index 51949f3fba116499b88cfabfae39dc8458a01ae9..f56e0569d4653c56e5110abca8ffcdb3df8b3ed4 100755
--- a/run.py
+++ b/run.py
@@ -70,7 +70,7 @@ class EngineRunner:
"""
Starts Engine Core.
"""
- from src.core.engine import Engine
+ from src.engine import Engine
self.engine = Engine()
diff --git a/src/core/channels.py b/src/channels.py
similarity index 99%
rename from src/core/channels.py
rename to src/channels.py
index d251cdd474013a8e88deaae1bd61d41d7778b994..3a0be4af8cc31a1a4f7664c9906d094f4b6facff 100644
--- a/src/core/channels.py
+++ b/src/channels.py
@@ -20,7 +20,7 @@
from enum import Enum
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceType
+from src.resources import ResourceType
class TransitionType(Enum):
diff --git a/src/core/client/client.py b/src/client/client.py
similarity index 100%
rename from src/core/client/client.py
rename to src/client/client.py
diff --git a/src/core/client/connector.py b/src/client/connector.py
similarity index 99%
rename from src/core/client/connector.py
rename to src/client/connector.py
index 446fc78dd999ba5d033c7fa96aa02f8c94b0aa1d..a39f0fd84f5945fdfc77430ca1c8a32af7279029 100644
--- a/src/core/client/connector.py
+++ b/src/client/connector.py
@@ -23,7 +23,7 @@ import time
from src.base.config import AuraConfig
from src.base.utils import TerminalColors, SimpleUtil as SU
from src.base.exceptions import LQConnectionError
-from src.core.client.playerclient import LiquidSoapPlayerClient
+from src.client.playerclient import LiquidSoapPlayerClient
diff --git a/src/core/client/playerclient.py b/src/client/playerclient.py
similarity index 99%
rename from src/core/client/playerclient.py
rename to src/client/playerclient.py
index 3a822d199686ae10fff4ba0f2ef2c149a19405a2..8efcb2940b8a0fe088f37e08ee68527b9b586084 100644
--- a/src/core/client/playerclient.py
+++ b/src/client/playerclient.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from src.core.client.client import LiquidSoapClient
+from src.client.client import LiquidSoapClient
class LiquidSoapPlayerClient(LiquidSoapClient):
diff --git a/src/core/control.py b/src/control.py
similarity index 99%
rename from src/core/control.py
rename to src/control.py
index 516fdc39c5437eb4fc1df50f8851953e89615609..441a281d4c004f931ea4d761783ac2a3d4107109 100644
--- a/src/core/control.py
+++ b/src/control.py
@@ -209,7 +209,7 @@ class EngineExecutor(Timer):
param (object): Parameter passt to the function
"""
self._lock = Lock()
- from src.core.engine import Engine
+ from src.engine import Engine
now_unix = Engine.engine_time()
# Init parent-child relation
diff --git a/src/core/__init__.py b/src/core/__init__.py
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/src/core/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/core/engine.py b/src/engine.py
similarity index 96%
rename from src/core/engine.py
rename to src/engine.py
index 1d0d8e57539ef0fc465b8853694416b986d64635..bbd637734b0bf1142d7afd387ba46630f4ee3f70 100644
--- a/src/core/engine.py
+++ b/src/engine.py
@@ -20,20 +20,20 @@
import time
import logging
-from contextlib import suppress
-from threading import Thread
+from contextlib import suppress
+from threading import Thread
import meta
-from src.base.config import AuraConfig
-from src.base.utils import SimpleUtil as SU
-from src.base.exceptions import LQConnectionError, InvalidChannelException, LQStreamException, LoadSourceException
-from src.core.resources import ResourceClass, ResourceUtil
-from src.core.channels import ChannelType, TransitionType, LiquidsoapResponse, EntryPlayState, ResourceType, ChannelRouter
-from src.core.events import EngineEventDispatcher
-from src.core.control import EngineControlInterface
-from src.core.mixer import Mixer, MixerType
-from src.core.client.connector import PlayerConnector
+from src.base.config import AuraConfig
+from src.base.utils import SimpleUtil as SU
+from src.base.exceptions import LQConnectionError, InvalidChannelException, LQStreamException, LoadSourceException
+from src.resources import ResourceClass, ResourceUtil
+from src.channels import ChannelType, TransitionType, LiquidsoapResponse, EntryPlayState, ResourceType, ChannelRouter
+from src.events import EngineEventDispatcher
+from src.control import EngineControlInterface
+from src.mixer import Mixer, MixerType
+from src.client.connector import PlayerConnector
diff --git a/src/core/events.py b/src/events.py
similarity index 100%
rename from src/core/events.py
rename to src/events.py
diff --git a/src/core/mixer.py b/src/mixer.py
similarity index 100%
rename from src/core/mixer.py
rename to src/mixer.py
diff --git a/src/plugins/trackservice.py b/src/plugins/trackservice.py
index cbf79b2d8722631715bc67392ea43d9d9789bc77..1373d48f2f11d9100afae4a075983f8c677983cd 100644
--- a/src/plugins/trackservice.py
+++ b/src/plugins/trackservice.py
@@ -26,8 +26,8 @@ from datetime import datetime, timedelta
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceClass
-from src.core.resources import ResourceUtil
+from src.resources import ResourceClass
+from src.resources import ResourceUtil
from src.scheduling.fallback import FallbackType
diff --git a/src/core/resources.py b/src/resources.py
similarity index 100%
rename from src/core/resources.py
rename to src/resources.py
diff --git a/src/scheduling/fallback.py b/src/scheduling/fallback.py
index faf721f02877afb91cfcec5609f594ea7c777a01..b24250912820f653f0b86206cc920f58a7148611 100644
--- a/src/scheduling/fallback.py
+++ b/src/scheduling/fallback.py
@@ -26,9 +26,9 @@ from datetime import timedelta
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.resources import ResourceClass, ResourceUtil
-from src.core.channels import Channel
-from src.core.control import EngineExecutor
+from src.resources import ResourceClass, ResourceUtil
+from src.channels import Channel
+from src.control import EngineExecutor
from src.scheduling.models import DB
@@ -300,7 +300,7 @@ class FallbackCommand(EngineExecutor):
timeslot (Timeslot): The timeslot any fallback entries should be scheduled for
entries (List): List of entries to be scheduled as fallback
"""
- from src.core.engine import Engine
+ from src.engine import Engine
def do_play(entries):
self.logger.info(SU.cyan(f"=== start_fallback_playlist('{entries}') ==="))
diff --git a/src/scheduling/models.py b/src/scheduling/models.py
index ae70bfb1055416c5639268ff484654ba2d3e99d7..1f4777030cd5a1f7ca0f6a90018dd7931453d0a8 100644
--- a/src/scheduling/models.py
+++ b/src/scheduling/models.py
@@ -33,7 +33,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil
-from src.core.resources import ResourceUtil
+from src.resources import ResourceUtil
# Initialize DB Model and session
config = AuraConfig()
diff --git a/src/scheduling/programme.py b/src/scheduling/programme.py
index 9cec262ff797a310ee6ced690073231318999b86..195c901aeee3f10d063dce864391d90e3a75a7af 100644
--- a/src/scheduling/programme.py
+++ b/src/scheduling/programme.py
@@ -27,7 +27,7 @@ from datetime import datetime
from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
-from src.core.engine import Engine
+from src.engine import Engine
from src.scheduling.utils import M3UPlaylistProcessor
from src.scheduling.models import Timeslot, Playlist, PlaylistEntry, PlaylistEntryMetaData
from src.scheduling.api import ApiFetcher
diff --git a/src/scheduling/scheduler.py b/src/scheduling/scheduler.py
index 6e81b39e35089748932f24da57240c5e07e421b6..cd376899f69d38d42135bce621dae161d53e14cf 100644
--- a/src/scheduling/scheduler.py
+++ b/src/scheduling/scheduler.py
@@ -27,10 +27,10 @@ from src.base.config import AuraConfig
from src.base.utils import SimpleUtil as SU
from src.scheduling.models import AuraDatabaseModel
from src.base.exceptions import NoActiveTimeslotException, LoadSourceException
-from src.core.control import EngineExecutor
-from src.core.engine import Engine
-from src.core.channels import ChannelType, TransitionType, EntryPlayState
-from src.core.resources import ResourceClass, ResourceUtil
+from src.control import EngineExecutor
+from src.engine import Engine
+from src.channels import ChannelType, TransitionType, EntryPlayState
+from src.resources import ResourceClass, ResourceUtil
from src.scheduling.utils import TimeslotRenderer
from src.scheduling.programme import ProgrammeService