diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py
index 9d16f0ba..e05b5f9d 100644
--- a/jellyfin_kodi/connect.py
+++ b/jellyfin_kodi/connect.py
@@ -12,8 +12,8 @@ from database import get_credentials, save_credentials
 from dialogs import ServerConnect, UsersConnect, LoginManual, ServerManual
 from helper import settings, addon_id, event, api, window
 from jellyfin import Jellyfin
-from jellyfin.core.connection_manager import CONNECTION_STATE
-from jellyfin.core.exceptions import HTTPException
+from jellyfin.connection_manager import CONNECTION_STATE
+from jellyfin.exceptions import HTTPException
 
 ##################################################################################################
 
diff --git a/jellyfin_kodi/dialogs/serverconnect.py b/jellyfin_kodi/dialogs/serverconnect.py
index 349280b5..a1377fbf 100644
--- a/jellyfin_kodi/dialogs/serverconnect.py
+++ b/jellyfin_kodi/dialogs/serverconnect.py
@@ -8,7 +8,7 @@ import xbmc
 import xbmcgui
 
 from helper import _
-from jellyfin.core.connection_manager import CONNECTION_STATE
+from jellyfin.connection_manager import CONNECTION_STATE
 
 ##################################################################################################
 
diff --git a/jellyfin_kodi/dialogs/servermanual.py b/jellyfin_kodi/dialogs/servermanual.py
index 314e9c28..a187ac66 100644
--- a/jellyfin_kodi/dialogs/servermanual.py
+++ b/jellyfin_kodi/dialogs/servermanual.py
@@ -10,7 +10,7 @@ import xbmcgui
 import xbmcaddon
 
 from helper import _, addon_id
-from jellyfin.core.connection_manager import CONNECTION_STATE
+from jellyfin.connection_manager import CONNECTION_STATE
 
 ##################################################################################################
 
diff --git a/jellyfin_kodi/downloader.py b/jellyfin_kodi/downloader.py
index a345ce00..fef18a4c 100644
--- a/jellyfin_kodi/downloader.py
+++ b/jellyfin_kodi/downloader.py
@@ -10,8 +10,8 @@ import xbmc
 import requests
 from helper import settings, stop, event, window, create_id
 from jellyfin import Jellyfin
-from jellyfin.core import api
-from jellyfin.core.exceptions import HTTPException
+from jellyfin import api
+from jellyfin.exceptions import HTTPException
 
 #################################################################################################
 
diff --git a/jellyfin_kodi/jellyfin/core/api.py b/jellyfin_kodi/jellyfin/api.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/api.py
rename to jellyfin_kodi/jellyfin/api.py
diff --git a/jellyfin_kodi/jellyfin/client.py b/jellyfin_kodi/jellyfin/client.py
index 7f03ff92..ee9db7fd 100644
--- a/jellyfin_kodi/jellyfin/client.py
+++ b/jellyfin_kodi/jellyfin/client.py
@@ -4,11 +4,11 @@
 
 import logging
 
-import core.api as api
-from core.configuration import Config
-from core.http import HTTP
-from core.ws_client import WSClient
-from core.connection_manager import ConnectionManager, CONNECTION_STATE
+import api
+from configuration import Config
+from http import HTTP
+from ws_client import WSClient
+from connection_manager import ConnectionManager, CONNECTION_STATE
 
 #################################################################################################
 
diff --git a/jellyfin_kodi/jellyfin/core/configuration.py b/jellyfin_kodi/jellyfin/configuration.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/configuration.py
rename to jellyfin_kodi/jellyfin/configuration.py
diff --git a/jellyfin_kodi/jellyfin/core/connection_manager.py b/jellyfin_kodi/jellyfin/connection_manager.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/connection_manager.py
rename to jellyfin_kodi/jellyfin/connection_manager.py
diff --git a/jellyfin_kodi/jellyfin/core/__init__.py b/jellyfin_kodi/jellyfin/core/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/jellyfin_kodi/jellyfin/core/credentials.py b/jellyfin_kodi/jellyfin/credentials.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/credentials.py
rename to jellyfin_kodi/jellyfin/credentials.py
diff --git a/jellyfin_kodi/jellyfin/core/exceptions.py b/jellyfin_kodi/jellyfin/exceptions.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/exceptions.py
rename to jellyfin_kodi/jellyfin/exceptions.py
diff --git a/jellyfin_kodi/jellyfin/core/http.py b/jellyfin_kodi/jellyfin/http.py
similarity index 100%
rename from jellyfin_kodi/jellyfin/core/http.py
rename to jellyfin_kodi/jellyfin/http.py
diff --git a/jellyfin_kodi/jellyfin/core/ws_client.py b/jellyfin_kodi/jellyfin/ws_client.py
similarity index 98%
rename from jellyfin_kodi/jellyfin/core/ws_client.py
rename to jellyfin_kodi/jellyfin/ws_client.py
index b51b45b1..a2f1b8d8 100644
--- a/jellyfin_kodi/jellyfin/core/ws_client.py
+++ b/jellyfin_kodi/jellyfin/ws_client.py
@@ -8,7 +8,7 @@ import threading
 
 import xbmc
 
-from .. import websocket
+import websocket
 
 ##################################################################################################