diff --git a/src/entities/SharedEntities.ts b/src/entities/SharedEntities.ts
new file mode 100644
index 0000000..ad723c5
--- /dev/null
+++ b/src/entities/SharedEntities.ts
@@ -0,0 +1,13 @@
+export interface IEntityWithOptionalTimestamp {
+  millisecondsSinceEpoch?: number;
+}
+
+export interface IEntityWithId {
+  id: string;
+}
+
+export interface ICoordinates {
+  latitude: number;
+  longitude: number;
+}
+
diff --git a/src/entities/ShuttleRepositoryEntities.ts b/src/entities/ShuttleRepositoryEntities.ts
index e093eda..3ab9a29 100644
--- a/src/entities/ShuttleRepositoryEntities.ts
+++ b/src/entities/ShuttleRepositoryEntities.ts
@@ -1,15 +1,4 @@
-export interface IEntityWithOptionalTimestamp {
-  millisecondsSinceEpoch?: number;
-}
-
-export interface IEntityWithId {
-  id: string;
-}
-
-export interface ICoordinates {
-  latitude: number;
-  longitude: number;
-}
+import { ICoordinates, IEntityWithId, IEntityWithOptionalTimestamp } from "./SharedEntities";
 
 export interface IRoute extends IEntityWithId, IEntityWithOptionalTimestamp {
   name: string;