From 49bc9eaf3e603b5e8fc64d794a9ab51e282d7568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 30 Dec 2024 20:37:34 +0200
Subject: [PATCH 1/5] Register plextraktsync.plex.guid,
 plextraktsync.plex.guid.provider namespaces

---
 pyproject.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index beb85c64fa..5d2c63d6b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,6 +54,8 @@ packages = [
     "plextraktsync.factory",
     "plextraktsync.plan",
     "plextraktsync.plex",
+    "plextraktsync.plex.guid",
+    "plextraktsync.plex.guid.provider",
     "plextraktsync.plugin",
     "plextraktsync.queue",
     "plextraktsync.rich",

From 37b549e34562f3182ab9743adfef1d107d5a111c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 1 Jan 2025 17:41:03 +0200
Subject: [PATCH 2/5] Rename PlexGuidProvider to plex.guid.provider.Factory

---
 plextraktsync/plex/PlexGuid.py                               | 5 +++--
 .../plex/{PlexGuidProvider.py => guid/provider/Factory.py}   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename plextraktsync/plex/{PlexGuidProvider.py => guid/provider/Factory.py} (98%)

diff --git a/plextraktsync/plex/PlexGuid.py b/plextraktsync/plex/PlexGuid.py
index 0a6798eb23..71e2945838 100644
--- a/plextraktsync/plex/PlexGuid.py
+++ b/plextraktsync/plex/PlexGuid.py
@@ -4,9 +4,10 @@
 from typing import TYPE_CHECKING
 
 from plextraktsync.factory import factory
-from plextraktsync.plex.PlexGuidProvider import PlexGuidProvider
 from plextraktsync.rich.RichMarkup import RichMarkup
 
+from .guid.provider.Factory import Factory as GuidProviderFactory
+
 if TYPE_CHECKING:
     from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
 
@@ -108,7 +109,7 @@ def title_link(self):
 
     @property
     def provider_link(self):
-        provider = PlexGuidProvider().create(self)
+        provider = GuidProviderFactory().create(self)
         link = provider.link
 
         if not link:
diff --git a/plextraktsync/plex/PlexGuidProvider.py b/plextraktsync/plex/guid/provider/Factory.py
similarity index 98%
rename from plextraktsync/plex/PlexGuidProvider.py
rename to plextraktsync/plex/guid/provider/Factory.py
index a6e2bbb9a6..65ff6aac4e 100644
--- a/plextraktsync/plex/PlexGuidProvider.py
+++ b/plextraktsync/plex/guid/provider/Factory.py
@@ -13,7 +13,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProvider:
+class Factory:
     @classmethod
     def create(cls, guid: PlexGuid):
         if guid.provider == "imdb":

From 182df229b38e03e533e49b03014b256f066ce847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 30 Dec 2024 20:39:13 +0200
Subject: [PATCH 3/5] Move plex guid providers to own namespace

---
 plextraktsync/plex/guid/provider/Factory.py          | 12 ++++++------
 .../plex/{ => guid/provider}/PlexGuidProviderIMDB.py |  0
 .../{ => guid/provider}/PlexGuidProviderLocal.py     |  0
 .../plex/{ => guid/provider}/PlexGuidProviderMbid.py |  0
 .../plex/{ => guid/provider}/PlexGuidProviderTMDB.py |  0
 .../plex/{ => guid/provider}/PlexGuidProviderTVDB.py |  0
 .../{ => guid/provider}/PlexGuidProviderYoutube.py   |  0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderIMDB.py (100%)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderLocal.py (100%)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderMbid.py (100%)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderTMDB.py (100%)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderTVDB.py (100%)
 rename plextraktsync/plex/{ => guid/provider}/PlexGuidProviderYoutube.py (100%)

diff --git a/plextraktsync/plex/guid/provider/Factory.py b/plextraktsync/plex/guid/provider/Factory.py
index 65ff6aac4e..d9aaa6d738 100644
--- a/plextraktsync/plex/guid/provider/Factory.py
+++ b/plextraktsync/plex/guid/provider/Factory.py
@@ -2,12 +2,12 @@
 
 from typing import TYPE_CHECKING
 
-from plextraktsync.plex.PlexGuidProviderIMDB import PlexGuidProviderIMDB
-from plextraktsync.plex.PlexGuidProviderLocal import PlexGuidProviderLocal
-from plextraktsync.plex.PlexGuidProviderMbid import PlexGuidProviderMbid
-from plextraktsync.plex.PlexGuidProviderTMDB import PlexGuidProviderTMDB
-from plextraktsync.plex.PlexGuidProviderTVDB import PlexGuidProviderTVDB
-from plextraktsync.plex.PlexGuidProviderYoutube import PlexGuidProviderYoutube
+from .PlexGuidProviderIMDB import PlexGuidProviderIMDB
+from .PlexGuidProviderLocal import PlexGuidProviderLocal
+from .PlexGuidProviderMbid import PlexGuidProviderMbid
+from .PlexGuidProviderTMDB import PlexGuidProviderTMDB
+from .PlexGuidProviderTVDB import PlexGuidProviderTVDB
+from .PlexGuidProviderYoutube import PlexGuidProviderYoutube
 
 if TYPE_CHECKING:
     from plextraktsync.plex.PlexGuid import PlexGuid
diff --git a/plextraktsync/plex/PlexGuidProviderIMDB.py b/plextraktsync/plex/guid/provider/PlexGuidProviderIMDB.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderIMDB.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderIMDB.py
diff --git a/plextraktsync/plex/PlexGuidProviderLocal.py b/plextraktsync/plex/guid/provider/PlexGuidProviderLocal.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderLocal.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderLocal.py
diff --git a/plextraktsync/plex/PlexGuidProviderMbid.py b/plextraktsync/plex/guid/provider/PlexGuidProviderMbid.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderMbid.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderMbid.py
diff --git a/plextraktsync/plex/PlexGuidProviderTMDB.py b/plextraktsync/plex/guid/provider/PlexGuidProviderTMDB.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderTMDB.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderTMDB.py
diff --git a/plextraktsync/plex/PlexGuidProviderTVDB.py b/plextraktsync/plex/guid/provider/PlexGuidProviderTVDB.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderTVDB.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderTVDB.py
diff --git a/plextraktsync/plex/PlexGuidProviderYoutube.py b/plextraktsync/plex/guid/provider/PlexGuidProviderYoutube.py
similarity index 100%
rename from plextraktsync/plex/PlexGuidProviderYoutube.py
rename to plextraktsync/plex/guid/provider/PlexGuidProviderYoutube.py

From 29acd86f842236c080f4143fc6b45240f0b1eed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 30 Dec 2024 20:48:33 +0200
Subject: [PATCH 4/5] Remove PlexGuidProvider prefix from class names

---
 plextraktsync/plex/guid/provider/Factory.py   | 24 +++++++++----------
 .../{PlexGuidProviderIMDB.py => IMDB.py}      |  2 +-
 .../{PlexGuidProviderLocal.py => Local.py}    |  2 +-
 .../{PlexGuidProviderMbid.py => Mbid.py}      |  2 +-
 .../{PlexGuidProviderTMDB.py => TMDB.py}      |  2 +-
 .../{PlexGuidProviderTVDB.py => TVDB.py}      |  2 +-
 ...{PlexGuidProviderYoutube.py => Youtube.py} |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderIMDB.py => IMDB.py} (93%)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderLocal.py => Local.py} (92%)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderMbid.py => Mbid.py} (95%)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderTMDB.py => TMDB.py} (97%)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderTVDB.py => TVDB.py} (93%)
 rename plextraktsync/plex/guid/provider/{PlexGuidProviderYoutube.py => Youtube.py} (93%)

diff --git a/plextraktsync/plex/guid/provider/Factory.py b/plextraktsync/plex/guid/provider/Factory.py
index d9aaa6d738..146599fd95 100644
--- a/plextraktsync/plex/guid/provider/Factory.py
+++ b/plextraktsync/plex/guid/provider/Factory.py
@@ -2,12 +2,12 @@
 
 from typing import TYPE_CHECKING
 
-from .PlexGuidProviderIMDB import PlexGuidProviderIMDB
-from .PlexGuidProviderLocal import PlexGuidProviderLocal
-from .PlexGuidProviderMbid import PlexGuidProviderMbid
-from .PlexGuidProviderTMDB import PlexGuidProviderTMDB
-from .PlexGuidProviderTVDB import PlexGuidProviderTVDB
-from .PlexGuidProviderYoutube import PlexGuidProviderYoutube
+from .IMDB import IMDB
+from .Local import Local
+from .Mbid import Mbid
+from .TMDB import TMDB
+from .TVDB import TVDB
+from .Youtube import Youtube
 
 if TYPE_CHECKING:
     from plextraktsync.plex.PlexGuid import PlexGuid
@@ -17,16 +17,16 @@ class Factory:
     @classmethod
     def create(cls, guid: PlexGuid):
         if guid.provider == "imdb":
-            return PlexGuidProviderIMDB(guid)
+            return IMDB(guid)
         if guid.provider == "tmdb":
-            return PlexGuidProviderTMDB(guid)
+            return TMDB(guid)
         if guid.provider == "tvdb":
-            return PlexGuidProviderTVDB(guid)
+            return TVDB(guid)
         if guid.provider == "mbid":
-            return PlexGuidProviderMbid(guid)
+            return Mbid(guid)
         if guid.provider == "youtube":
-            return PlexGuidProviderYoutube(guid)
+            return Youtube(guid)
         if guid.provider in ["local", "none"]:
-            return PlexGuidProviderLocal(guid)
+            return Local(guid)
 
         raise RuntimeError(f"Unsupported provider: {guid.provider}")
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderIMDB.py b/plextraktsync/plex/guid/provider/IMDB.py
similarity index 93%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderIMDB.py
rename to plextraktsync/plex/guid/provider/IMDB.py
index a3c11e88b6..780d91ce0c 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderIMDB.py
+++ b/plextraktsync/plex/guid/provider/IMDB.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderIMDB:
+class IMDB:
     def __init__(self, guid: PlexGuid):
         self.guid = guid
 
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderLocal.py b/plextraktsync/plex/guid/provider/Local.py
similarity index 92%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderLocal.py
rename to plextraktsync/plex/guid/provider/Local.py
index f93e52edcd..a097cdb6e8 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderLocal.py
+++ b/plextraktsync/plex/guid/provider/Local.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderLocal:
+class Local:
     def __init__(self, guid: PlexGuid):
         self.guid = guid
 
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderMbid.py b/plextraktsync/plex/guid/provider/Mbid.py
similarity index 95%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderMbid.py
rename to plextraktsync/plex/guid/provider/Mbid.py
index 3abdacdcf1..290c2974cf 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderMbid.py
+++ b/plextraktsync/plex/guid/provider/Mbid.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderMbid:
+class Mbid:
     def __init__(self, guid: PlexGuid):
         self.guid = guid
 
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderTMDB.py b/plextraktsync/plex/guid/provider/TMDB.py
similarity index 97%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderTMDB.py
rename to plextraktsync/plex/guid/provider/TMDB.py
index e3695fb2c0..bee1a5c0bf 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderTMDB.py
+++ b/plextraktsync/plex/guid/provider/TMDB.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderTMDB:
+class TMDB:
     url = "https://www.themoviedb.org"
 
     def __init__(self, guid: PlexGuid):
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderTVDB.py b/plextraktsync/plex/guid/provider/TVDB.py
similarity index 93%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderTVDB.py
rename to plextraktsync/plex/guid/provider/TVDB.py
index 67feae0a75..a35cbc2d97 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderTVDB.py
+++ b/plextraktsync/plex/guid/provider/TVDB.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderTVDB:
+class TVDB:
     def __init__(self, guid: PlexGuid):
         self.guid = guid
 
diff --git a/plextraktsync/plex/guid/provider/PlexGuidProviderYoutube.py b/plextraktsync/plex/guid/provider/Youtube.py
similarity index 93%
rename from plextraktsync/plex/guid/provider/PlexGuidProviderYoutube.py
rename to plextraktsync/plex/guid/provider/Youtube.py
index 1ed1e94907..1a0548b755 100644
--- a/plextraktsync/plex/guid/provider/PlexGuidProviderYoutube.py
+++ b/plextraktsync/plex/guid/provider/Youtube.py
@@ -6,7 +6,7 @@
     from plextraktsync.plex.PlexGuid import PlexGuid
 
 
-class PlexGuidProviderYoutube:
+class Youtube:
     def __init__(self, guid: PlexGuid):
         self.guid = guid
 

From 6ae7106d191678785bb9497effbb46ded735d920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 1 Jan 2025 17:43:51 +0200
Subject: [PATCH 5/5] Move PlexGuid to plextraktsync.plex.guid namespace

---
 plextraktsync/media/MediaFactory.py         | 2 +-
 plextraktsync/plan/Walker.py                | 2 +-
 plextraktsync/plex/PlexApi.py               | 2 +-
 plextraktsync/plex/PlexLibraryItem.py       | 2 +-
 plextraktsync/plex/{ => guid}/PlexGuid.py   | 2 +-
 plextraktsync/plex/guid/provider/Factory.py | 2 +-
 plextraktsync/plex/guid/provider/IMDB.py    | 2 +-
 plextraktsync/plex/guid/provider/Local.py   | 2 +-
 plextraktsync/plex/guid/provider/Mbid.py    | 2 +-
 plextraktsync/plex/guid/provider/TMDB.py    | 2 +-
 plextraktsync/plex/guid/provider/TVDB.py    | 2 +-
 plextraktsync/plex/guid/provider/Youtube.py | 2 +-
 plextraktsync/trakt/TraktApi.py             | 2 +-
 plextraktsync/trakt/TraktLookup.py          | 2 +-
 tests/test_tv_lookup.py                     | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
 rename plextraktsync/plex/{ => guid}/PlexGuid.py (98%)

diff --git a/plextraktsync/media/MediaFactory.py b/plextraktsync/media/MediaFactory.py
index 8d856241ee..81134902c1 100644
--- a/plextraktsync/media/MediaFactory.py
+++ b/plextraktsync/media/MediaFactory.py
@@ -10,8 +10,8 @@
 from plextraktsync.media.Media import Media
 
 if TYPE_CHECKING:
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
     from plextraktsync.plex.PlexApi import PlexApi
-    from plextraktsync.plex.PlexGuid import PlexGuid
     from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
     from plextraktsync.trakt.TraktApi import TraktApi
     from plextraktsync.trakt.TraktItem import TraktItem
diff --git a/plextraktsync/plan/Walker.py b/plextraktsync/plan/Walker.py
index 60d07683a8..9f618324a4 100644
--- a/plextraktsync/plan/Walker.py
+++ b/plextraktsync/plan/Walker.py
@@ -6,7 +6,7 @@
 from plextraktsync.decorators.measure_time import measure_time
 from plextraktsync.factory import logging
 from plextraktsync.mixin.SetWindowTitle import SetWindowTitle
-from plextraktsync.plex.PlexGuid import PlexGuid
+from plextraktsync.plex.guid.PlexGuid import PlexGuid
 from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
 from plextraktsync.trakt.TraktApi import TraktApi
 from plextraktsync.trakt.TraktItem import TraktItem
diff --git a/plextraktsync/plex/PlexApi.py b/plextraktsync/plex/PlexApi.py
index f9ea298cf5..3ecd4f4172 100644
--- a/plextraktsync/plex/PlexApi.py
+++ b/plextraktsync/plex/PlexApi.py
@@ -105,7 +105,7 @@ def search_by_guid(self, guids: dict, libtype: str):
         fetchItem(ekey, guid__id__regex=r"(imdb|tmdb|tvdb)://")
         """
 
-        from plextraktsync.plex.PlexGuid import PlexGuid
+        from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
         # Build regex of possible matches
         keys = "|".join(guids.keys())
diff --git a/plextraktsync/plex/PlexLibraryItem.py b/plextraktsync/plex/PlexLibraryItem.py
index 967dea3144..e37b2a3bb8 100644
--- a/plextraktsync/plex/PlexLibraryItem.py
+++ b/plextraktsync/plex/PlexLibraryItem.py
@@ -8,7 +8,7 @@
 
 from plextraktsync.decorators.retry import retry
 from plextraktsync.factory import factory
-from plextraktsync.plex.PlexGuid import PlexGuid
+from plextraktsync.plex.guid.PlexGuid import PlexGuid
 from plextraktsync.rich.RichMarkup import RichMarkup
 from plextraktsync.util.Rating import Rating
 
diff --git a/plextraktsync/plex/PlexGuid.py b/plextraktsync/plex/guid/PlexGuid.py
similarity index 98%
rename from plextraktsync/plex/PlexGuid.py
rename to plextraktsync/plex/guid/PlexGuid.py
index 71e2945838..5056e37f8a 100644
--- a/plextraktsync/plex/PlexGuid.py
+++ b/plextraktsync/plex/guid/PlexGuid.py
@@ -6,7 +6,7 @@
 from plextraktsync.factory import factory
 from plextraktsync.rich.RichMarkup import RichMarkup
 
-from .guid.provider.Factory import Factory as GuidProviderFactory
+from .provider.Factory import Factory as GuidProviderFactory
 
 if TYPE_CHECKING:
     from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
diff --git a/plextraktsync/plex/guid/provider/Factory.py b/plextraktsync/plex/guid/provider/Factory.py
index 146599fd95..b371b93111 100644
--- a/plextraktsync/plex/guid/provider/Factory.py
+++ b/plextraktsync/plex/guid/provider/Factory.py
@@ -10,7 +10,7 @@
 from .Youtube import Youtube
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class Factory:
diff --git a/plextraktsync/plex/guid/provider/IMDB.py b/plextraktsync/plex/guid/provider/IMDB.py
index 780d91ce0c..0018660d41 100644
--- a/plextraktsync/plex/guid/provider/IMDB.py
+++ b/plextraktsync/plex/guid/provider/IMDB.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class IMDB:
diff --git a/plextraktsync/plex/guid/provider/Local.py b/plextraktsync/plex/guid/provider/Local.py
index a097cdb6e8..2cccbc1ba6 100644
--- a/plextraktsync/plex/guid/provider/Local.py
+++ b/plextraktsync/plex/guid/provider/Local.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class Local:
diff --git a/plextraktsync/plex/guid/provider/Mbid.py b/plextraktsync/plex/guid/provider/Mbid.py
index 290c2974cf..f9af0a5f8b 100644
--- a/plextraktsync/plex/guid/provider/Mbid.py
+++ b/plextraktsync/plex/guid/provider/Mbid.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class Mbid:
diff --git a/plextraktsync/plex/guid/provider/TMDB.py b/plextraktsync/plex/guid/provider/TMDB.py
index bee1a5c0bf..a024d02594 100644
--- a/plextraktsync/plex/guid/provider/TMDB.py
+++ b/plextraktsync/plex/guid/provider/TMDB.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class TMDB:
diff --git a/plextraktsync/plex/guid/provider/TVDB.py b/plextraktsync/plex/guid/provider/TVDB.py
index a35cbc2d97..99c155d60e 100644
--- a/plextraktsync/plex/guid/provider/TVDB.py
+++ b/plextraktsync/plex/guid/provider/TVDB.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class TVDB:
diff --git a/plextraktsync/plex/guid/provider/Youtube.py b/plextraktsync/plex/guid/provider/Youtube.py
index 1a0548b755..b3f6cb60d6 100644
--- a/plextraktsync/plex/guid/provider/Youtube.py
+++ b/plextraktsync/plex/guid/provider/Youtube.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class Youtube:
diff --git a/plextraktsync/trakt/TraktApi.py b/plextraktsync/trakt/TraktApi.py
index a13c5582ed..0e12780c14 100644
--- a/plextraktsync/trakt/TraktApi.py
+++ b/plextraktsync/trakt/TraktApi.py
@@ -34,7 +34,7 @@
     from trakt.movies import Movie
     from trakt.tv import TVEpisode, TVShow
 
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
     from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
     from plextraktsync.trakt.types import TraktLikedList, TraktMedia
 
diff --git a/plextraktsync/trakt/TraktLookup.py b/plextraktsync/trakt/TraktLookup.py
index 56f51f1448..abc9a97904 100644
--- a/plextraktsync/trakt/TraktLookup.py
+++ b/plextraktsync/trakt/TraktLookup.py
@@ -11,7 +11,7 @@
 if TYPE_CHECKING:
     from trakt.tv import TVEpisode, TVShow
 
-    from plextraktsync.plex.PlexGuid import PlexGuid
+    from plextraktsync.plex.guid.PlexGuid import PlexGuid
 
 
 class TraktLookup:
diff --git a/tests/test_tv_lookup.py b/tests/test_tv_lookup.py
index 8b982358ca..db5dbca86d 100755
--- a/tests/test_tv_lookup.py
+++ b/tests/test_tv_lookup.py
@@ -4,7 +4,7 @@
 import pytest
 from trakt.tv import TVShow
 
-from plextraktsync.plex.PlexGuid import PlexGuid
+from plextraktsync.plex.guid.PlexGuid import PlexGuid
 from plextraktsync.plex.PlexLibraryItem import PlexLibraryItem
 from plextraktsync.trakt.TraktLookup import TraktLookup
 from tests.conftest import factory, make