diff --git a/src/loaders/ApiBasedShuttleRepositoryLoader.ts b/src/loaders/ApiBasedShuttleRepositoryLoader.ts
index 631eef2..ff145cf 100644
--- a/src/loaders/ApiBasedShuttleRepositoryLoader.ts
+++ b/src/loaders/ApiBasedShuttleRepositoryLoader.ts
@@ -1,6 +1,7 @@
 import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { IEntityWithId, IEta, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { IEta, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
 import { ShuttleRepositoryLoader } from "./ShuttleRepositoryLoader";
+import { IEntityWithId } from "../entities/SharedEntities";
 
 export class ApiResponseError extends Error {
   constructor(message: string) {
diff --git a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts b/src/repositories/UnoptimizedInMemoryShuttleRepository.ts
index 7bc00cc..fd6c36f 100644
--- a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts
+++ b/src/repositories/UnoptimizedInMemoryShuttleRepository.ts
@@ -1,5 +1,6 @@
 import { ShuttleGetterSetterRepository } from "./ShuttleGetterSetterRepository";
-import { IEntityWithId, IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { IEntityWithId } from "../entities/SharedEntities";
 
 /**
  * An unoptimized in memory repository.