diff --git a/addon.py b/addon.py
index 30a1d03..08dbdd3 100644
--- a/addon.py
+++ b/addon.py
@@ -19,5 +19,5 @@
 
 from resources.lib import srfplaytv
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     srfplaytv.run()
diff --git a/resources/lib/srfplaytv.py b/resources/lib/srfplaytv.py
index 75cb56a..4e77f05 100644
--- a/resources/lib/srfplaytv.py
+++ b/resources/lib/srfplaytv.py
@@ -26,20 +26,20 @@
 import xbmc
 import xbmcaddon
 import xbmcplugin
+
 import srgssr
 
-ADDON_ID = 'plugin.video.srfplaytv'
+ADDON_ID = "plugin.video.srfplaytv"
 REAL_SETTINGS = xbmcaddon.Addon(id=ADDON_ID)
-ADDON_NAME = REAL_SETTINGS.getAddonInfo('name')
-ADDON_VERSION = REAL_SETTINGS.getAddonInfo('version')
-DEBUG = (REAL_SETTINGS.getSetting('Enable_Debugging') == 'true')
-CONTENT_TYPE = 'videos'
+ADDON_NAME = REAL_SETTINGS.getAddonInfo("name")
+ADDON_VERSION = REAL_SETTINGS.getAddonInfo("version")
+DEBUG = REAL_SETTINGS.getSetting("Enable_Debugging") == "true"
+CONTENT_TYPE = "videos"
 
 
 class SRFPlayTV(srgssr.SRGSSR):
     def __init__(self):
-        super(SRFPlayTV, self).__init__(
-            int(sys.argv[1]), bu='srf', addon_id=ADDON_ID)
+        super(SRFPlayTV, self).__init__(int(sys.argv[1]), bu="srf", addon_id=ADDON_ID)
 
 
 def log(msg, level=xbmc.LOGDEBUG):
@@ -52,8 +52,8 @@ def log(msg, level=xbmc.LOGDEBUG):
     """
     if DEBUG:
         if level == xbmc.LOGERROR:
-            msg += ' ,' + traceback.format_exc()
-    xbmc.log(ADDON_ID + '-' + ADDON_VERSION + '-' + msg, level)
+            msg += " ," + traceback.format_exc()
+    xbmc.log(ADDON_ID + "-" + ADDON_VERSION + "-" + msg, level)
 
 
 def get_params():
@@ -78,75 +78,77 @@ def run():
     except Exception:
         mode = None
     try:
-        page_hash = unquote_plus(params['page_hash'])
+        page_hash = unquote_plus(params["page_hash"])
     except Exception:
         page_hash = None
     try:
-        page = unquote_plus(params['page'])
+        page = unquote_plus(params["page"])
     except Exception:
         page = None
 
-    log('Mode: ' + str(mode))
-    log('URL : ' + str(url))
-    log('Name: ' + str(name))
-    log('Page Hash: ' + str(page_hash))
-    log('Page: ' + str(page))
+    log("Mode: " + str(mode))
+    log("URL : " + str(url))
+    log("Name: " + str(name))
+    log("Page Hash: " + str(page_hash))
+    log("Page: " + str(page))
 
     if mode is None:
         identifiers = [
-            'All_Shows',
-            'Favourite_Shows',
-            'Newest_Favourite_Shows',
-            'Homepage',
-            'Topics',
-            'Most_Searched_TV_Shows',
-            'Shows_By_Date',
-            'Search',
-            'SRF_YouTube'
+            "All_Shows",
+            "Favourite_Shows",
+            "Newest_Favourite_Shows",
+            "Homepage",
+            "Topics",
+            "Most_Searched_TV_Shows",
+            "Shows_By_Date",
+            "Search",
+            "SRF_YouTube",
         ]
-        SRFPlayTV().build_main_menu(identifiers)
+        SRFPlayTV().menu_builder.build_main_menu(identifiers)
     elif mode == 10:
-        SRFPlayTV().build_all_shows_menu()
+        SRFPlayTV().menu_builder.build_all_shows_menu()
     elif mode == 11:
-        SRFPlayTV().build_favourite_shows_menu()
+        SRFPlayTV().menu_builder.build_favourite_shows_menu()
     elif mode == 12:
-        SRFPlayTV().build_newest_favourite_menu(page=page)
+        SRFPlayTV().menu_builder.build_newest_favourite_menu(page=page)
     elif mode == 13:
-        SRFPlayTV().build_topics_menu()
+        SRFPlayTV().menu_builder.build_topics_menu()
     elif mode == 14:
-        SRFPlayTV().build_most_searched_shows_menu()
+        SRFPlayTV().menu_builder.build_most_searched_shows_menu()
     elif mode == 17:
-        SRFPlayTV().build_dates_overview_menu()
+        SRFPlayTV().menu_builder.build_dates_overview_menu()
     elif mode == 19:
         SRFPlayTV().manage_favourite_shows()
     elif mode == 21:
-        SRFPlayTV().build_episode_menu(name)
+        SRFPlayTV().menu_builder.build_episode_menu(name)
     elif mode == 24:
-        SRFPlayTV().build_date_menu(name)
+        SRFPlayTV().menu_builder.build_date_menu(name)
     elif mode == 60:
-        SRFPlayTV().build_specific_date_menu(name)
+        SRFPlayTV().menu_builder.build_specific_date_menu(name)
     elif mode == 25:
-        SRFPlayTV().pick_date()
+        SRFPlayTV().menu_builder.pick_date()
     elif mode == 27:
-        SRFPlayTV().build_search_menu()
+        SRFPlayTV().menu_builder.build_search_menu()
     elif mode == 28:
-        SRFPlayTV().build_search_media_menu(
-            mode=mode, name=name, page=page, page_hash=page_hash)
+        SRFPlayTV().menu_builder.build_search_media_menu(
+            mode=mode, name=name, page=page, page_hash=page_hash
+        )
     elif mode == 70:
-        SRFPlayTV().build_recent_search_menu()
+        SRFPlayTV().menu_builder.build_recent_search_menu()
     elif mode == 30:
-        SRFPlayTV().build_youtube_channel_overview_menu(33)
+        SRFPlayTV().youtube_builder.build_youtube_channel_overview_menu(33)
     elif mode == 33:
-        SRFPlayTV().build_youtube_channel_menu(
-            name, mode, page=page, page_token=page_hash)
+        SRFPlayTV().youtube_builder.build_youtube_channel_menu(
+            name, mode, page=page, page_token=page_hash
+        )
     elif mode == 50:
-        SRFPlayTV().play_video(name)
+        SRFPlayTV().player.play_video(name)
     elif mode == 100:
-        SRFPlayTV().build_menu_by_urn(name)
+        SRFPlayTV().menu_builder.build_menu_by_urn(name)
     elif mode == 200:
-        SRFPlayTV().build_homepage_menu()
+        SRFPlayTV().menu_builder.build_homepage_menu()
     elif mode == 1000:
-        SRFPlayTV().build_menu_apiv3(name, mode, page, page_hash)
+        SRFPlayTV().menu_builder.build_menu_apiv3(name, mode, page, page_hash)
 
     xbmcplugin.setContent(int(sys.argv[1]), CONTENT_TYPE)
     xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)