diff --git a/plextraktsync/media/MediaFactory.py b/plextraktsync/media/MediaFactory.py
index 8d856241ee1..81134902c11 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 60d07683a8a..9f618324a41 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 f9ea298cf54..3ecd4f41724 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 967dea31443..e37b2a3bb8b 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 71e29458385..5056e37f8ac 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 146599fd952..b371b931119 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 780d91ce0c3..0018660d411 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 a097cdb6e87..2cccbc1ba62 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 290c2974cfe..f9af0a5f8bc 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 bee1a5c0bf8..a024d025946 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 a35cbc2d97a..99c155d60e5 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 1a0548b7550..b3f6cb60d6d 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 a13c5582ed0..0e12780c148 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 56f51f14484..abc9a979049 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 8b982358cab..db5dbca86d4 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