diff --git a/app/src/Config.py b/app/Config.py
similarity index 100%
rename from app/src/Config.py
rename to app/Config.py
diff --git a/app/src/DataStore.py b/app/DataStore.py
similarity index 97%
rename from app/src/DataStore.py
rename to app/DataStore.py
index 84be145c..05ce99ce 100644
--- a/app/src/DataStore.py
+++ b/app/DataStore.py
@@ -4,10 +4,10 @@ from datetime import datetime, timezone
 from email.utils import formatdate
 import json
 import sqlite3
-from src.Utils import calcDownloadPath
-from src.Config import Config
-from src.Download import Download
-from src.DTO.ItemDTO import ItemDTO
+from Utils import calcDownloadPath
+from Config import Config
+from Download import Download
+from ItemDTO import ItemDTO
 
 
 class DataStore:
diff --git a/app/src/Download.py b/app/Download.py
similarity index 98%
rename from app/src/Download.py
rename to app/Download.py
index bde97203..429bb130 100644
--- a/app/src/Download.py
+++ b/app/Download.py
@@ -7,9 +7,9 @@ import os
 import re
 import shutil
 import yt_dlp
-from src.Utils import get_format, get_opts, jsonCookie, mergeConfig
-from src.DTO.ItemDTO import ItemDTO
-from src.Notifier import Notifier
+from Utils import get_format, get_opts, jsonCookie, mergeConfig
+from ItemDTO import ItemDTO
+from Notifier import Notifier
 
 log = logging.getLogger('download')
 
diff --git a/app/src/DownloadQueue.py b/app/DownloadQueue.py
similarity index 97%
rename from app/src/DownloadQueue.py
rename to app/DownloadQueue.py
index 4ce8cf00..187f6b30 100644
--- a/app/src/DownloadQueue.py
+++ b/app/DownloadQueue.py
@@ -5,12 +5,12 @@ import os
 import time
 import yt_dlp
 from sqlite3 import Connection
-from src.Config import Config
-from src.Notifier import Notifier
-from src.Download import Download
-from src.DTO.ItemDTO import ItemDTO
-from src.DataStore import DataStore
-from src.Utils import ObjectSerializer, calcDownloadPath, ExtractInfo, mergeConfig
+from Config import Config
+from Notifier import Notifier
+from Download import Download
+from ItemDTO import ItemDTO
+from DataStore import DataStore
+from Utils import ObjectSerializer, calcDownloadPath, ExtractInfo, mergeConfig
 from datetime import datetime, timezone
 
 log = logging.getLogger('DownloadQueue')
diff --git a/app/src/DTO/ItemDTO.py b/app/ItemDTO.py
similarity index 100%
rename from app/src/DTO/ItemDTO.py
rename to app/ItemDTO.py
diff --git a/app/src/Notifier.py b/app/Notifier.py
similarity index 94%
rename from app/src/Notifier.py
rename to app/Notifier.py
index 53362b90..2af377b4 100644
--- a/app/src/Notifier.py
+++ b/app/Notifier.py
@@ -1,5 +1,5 @@
 from socketio import AsyncServer
-from src.Utils import ObjectSerializer
+from Utils import ObjectSerializer
 
 
 class Notifier:
diff --git a/app/src/Utils.py b/app/Utils.py
similarity index 100%
rename from app/src/Utils.py
rename to app/Utils.py
diff --git a/app/main.py b/app/main.py
index c07cd1de..c8b2e245 100644
--- a/app/main.py
+++ b/app/main.py
@@ -5,15 +5,15 @@ from datetime import datetime
 import json
 import os
 import random
-from src.Config import Config
+from Config import Config
 from version import APP_VERSION
-from src.Notifier import Notifier
-from src.DownloadQueue import DownloadQueue
-from src.Utils import ObjectSerializer
+from Notifier import Notifier
+from DownloadQueue import DownloadQueue
+from Utils import ObjectSerializer
 from aiohttp import web
 from aiohttp.web import Request, Response
-from src.M3u8 import M3u8
-from src.Segments import Segments
+from player.M3u8 import M3u8
+from player.Segments import Segments
 import socketio
 import logging
 import caribou
diff --git a/app/src/M3u8.py b/app/player/M3u8.py
similarity index 96%
rename from app/src/M3u8.py
rename to app/player/M3u8.py
index fcb83609..eb0db205 100644
--- a/app/src/M3u8.py
+++ b/app/player/M3u8.py
@@ -1,9 +1,9 @@
 import math
 import os
 from urllib.parse import quote
-from src.Utils import calcDownloadPath
-from src.ffprobe import FFProbe
-from src.Config import Config
+from Utils import calcDownloadPath
+from .ffprobe import FFProbe
+from Config import Config
 
 
 class M3u8:
diff --git a/app/src/Segments.py b/app/player/Segments.py
similarity index 98%
rename from app/src/Segments.py
rename to app/player/Segments.py
index 10571164..7ba8bed5 100644
--- a/app/src/Segments.py
+++ b/app/player/Segments.py
@@ -3,8 +3,8 @@ import logging
 import os
 import subprocess
 import tempfile
-from src.Utils import calcDownloadPath
-from src.Config import Config
+from Utils import calcDownloadPath
+from Config import Config
 
 log = logging.getLogger('segments')
 
diff --git a/app/src/ffprobe.py b/app/player/ffprobe.py
similarity index 99%
rename from app/src/ffprobe.py
rename to app/player/ffprobe.py
index 0d81b76e..d7ed76c4 100644
--- a/app/src/ffprobe.py
+++ b/app/player/ffprobe.py
@@ -6,7 +6,6 @@ import json
 import operator
 import os
 import pipes
-import re
 import subprocess