diff --git a/src/utils/ImdbId.test.ts b/src/utils/id/ImdbId.test.ts
similarity index 100%
rename from src/utils/ImdbId.test.ts
rename to src/utils/id/ImdbId.test.ts
diff --git a/src/utils/ImdbId.ts b/src/utils/id/ImdbId.ts
similarity index 100%
rename from src/utils/ImdbId.ts
rename to src/utils/id/ImdbId.ts
diff --git a/src/utils/TmdbId.test.ts b/src/utils/id/TmdbId.test.ts
similarity index 100%
rename from src/utils/TmdbId.test.ts
rename to src/utils/id/TmdbId.test.ts
diff --git a/src/utils/TmdbId.ts b/src/utils/id/TmdbId.ts
similarity index 100%
rename from src/utils/TmdbId.ts
rename to src/utils/id/TmdbId.ts
diff --git a/src/utils/id/index.ts b/src/utils/id/index.ts
new file mode 100644
index 0000000..c4e44b5
--- /dev/null
+++ b/src/utils/id/index.ts
@@ -0,0 +1,2 @@
+export * from './ImdbId';
+export * from './TmdbId';
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f9950e2..ed3c093 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,9 +1,8 @@
-export * from './env';
 export * from './Fetcher';
 export * from './StreamResolver';
 export * from './embed';
-export * from './ImdbId';
+export * from './env';
+export * from './id';
 export * from './language';
 export * from './manifest';
 export * from './tmdb';
-export * from './TmdbId';
diff --git a/src/utils/tmdb.test.ts b/src/utils/tmdb.test.ts
index 58a36a9..d595eda 100644
--- a/src/utils/tmdb.test.ts
+++ b/src/utils/tmdb.test.ts
@@ -1,8 +1,7 @@
 import { getImdbIdFromTmdbId, getTmdbIdFromImdbId } from './tmdb';
 import { Fetcher } from './Fetcher';
 import { Context } from '../types';
-import { ImdbId } from './ImdbId';
-import { TmdbId } from './TmdbId';
+import { ImdbId, TmdbId } from './id';
 jest.mock('../utils/Fetcher');
 
 // @ts-expect-error No constructor args needed
diff --git a/src/utils/tmdb.ts b/src/utils/tmdb.ts
index 8820a78..a9b2c41 100644
--- a/src/utils/tmdb.ts
+++ b/src/utils/tmdb.ts
@@ -1,5 +1,4 @@
-import { ImdbId } from './ImdbId';
-import { TmdbId } from './TmdbId';
+import { ImdbId, TmdbId } from './id';
 import { Context } from '../types';
 import { Fetcher } from './Fetcher';
 import { envGet } from './env';