diff --git a/src/entities/InterchangeSystem.ts b/src/entities/InterchangeSystem.ts
index af9faed..03428a2 100644
--- a/src/entities/InterchangeSystem.ts
+++ b/src/entities/InterchangeSystem.ts
@@ -1,19 +1,19 @@
 import { ETANotificationScheduler } from "../notifications/schedulers/ETANotificationScheduler";
 import { TimedApiBasedRepositoryLoader } from "../loaders/TimedApiBasedRepositoryLoader";
-import { UnoptimizedInMemoryShuttleRepository } from "../repositories/UnoptimizedInMemoryShuttleRepository";
-import { RedisNotificationRepository } from "../repositories/RedisNotificationRepository";
-import { NotificationRepository } from "../repositories/NotificationRepository";
-import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { InMemoryNotificationRepository } from "../repositories/InMemoryNotificationRepository";
+import { UnoptimizedInMemoryShuttleRepository } from "../repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
+import { RedisNotificationRepository } from "../repositories/notifications/RedisNotificationRepository";
+import { NotificationRepository } from "../repositories/notifications/NotificationRepository";
+import { ShuttleGetterSetterRepository } from "../repositories/shuttle/ShuttleGetterSetterRepository";
+import { InMemoryNotificationRepository } from "../repositories/notifications/InMemoryNotificationRepository";
 import { AppleNotificationSender } from "../notifications/senders/AppleNotificationSender";
 import { ApiBasedShuttleRepositoryLoader } from "../loaders/shuttle/ApiBasedShuttleRepositoryLoader";
-import { ParkingGetterSetterRepository } from "../repositories/ParkingGetterSetterRepository";
-import { InMemoryParkingRepository } from "../repositories/InMemoryParkingRepository";
+import { ParkingGetterSetterRepository } from "../repositories/parking/ParkingGetterSetterRepository";
+import { InMemoryParkingRepository } from "../repositories/parking/InMemoryParkingRepository";
 import {
   buildParkingRepositoryLoaderIfExists,
   ParkingRepositoryLoaderBuilderArguments
 } from "../loaders/parking/buildParkingRepositoryLoaderIfExists";
-import { RedisParkingRepository } from "../repositories/RedisParkingRepository";
+import { RedisParkingRepository } from "../repositories/parking/RedisParkingRepository";
 
 export interface InterchangeSystemBuilderArguments {
   name: string;
diff --git a/src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts b/src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts
index 5cfafea..5377c4c 100644
--- a/src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts
+++ b/src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts
@@ -1,5 +1,5 @@
 import { ParkingRepositoryLoader } from "./ParkingRepositoryLoader";
-import { ParkingGetterSetterRepository } from "../../repositories/ParkingGetterSetterRepository";
+import { ParkingGetterSetterRepository } from "../../repositories/parking/ParkingGetterSetterRepository";
 import { createHash } from "node:crypto";
 import { ApiResponseError } from "../ApiResponseError";
 import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
diff --git a/src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts b/src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts
index ae0383e..a70b2f5 100644
--- a/src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts
+++ b/src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts
@@ -1,4 +1,4 @@
-import { ParkingGetterSetterRepository } from "../../repositories/ParkingGetterSetterRepository";
+import { ParkingGetterSetterRepository } from "../../repositories/parking/ParkingGetterSetterRepository";
 import { ChapmanApiBasedParkingRepositoryLoader } from "./ChapmanApiBasedParkingRepositoryLoader";
 
 export interface ParkingRepositoryLoaderBuilderArguments {
diff --git a/src/loaders/parking/loadParkingTestData.ts b/src/loaders/parking/loadParkingTestData.ts
index be7663d..600a76e 100644
--- a/src/loaders/parking/loadParkingTestData.ts
+++ b/src/loaders/parking/loadParkingTestData.ts
@@ -1,4 +1,4 @@
-import { ParkingGetterSetterRepository } from "../../repositories/ParkingGetterSetterRepository";
+import { ParkingGetterSetterRepository } from "../../repositories/parking/ParkingGetterSetterRepository";
 import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
 
 const parkingStructures: IParkingStructure[] = [
diff --git a/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts b/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
index c7735aa..72e3d95 100644
--- a/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
+++ b/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
@@ -1,4 +1,4 @@
-import { ShuttleGetterSetterRepository } from "../../repositories/ShuttleGetterSetterRepository";
+import { ShuttleGetterSetterRepository } from "../../repositories/shuttle/ShuttleGetterSetterRepository";
 import { IEta, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
 import { ShuttleRepositoryLoader } from "./ShuttleRepositoryLoader";
 import { IEntityWithId } from "../../entities/SharedEntities";
diff --git a/src/loaders/shuttle/loadShuttleTestData.ts b/src/loaders/shuttle/loadShuttleTestData.ts
index 636efae..4713716 100644
--- a/src/loaders/shuttle/loadShuttleTestData.ts
+++ b/src/loaders/shuttle/loadShuttleTestData.ts
@@ -1,6 +1,6 @@
 // Mock data
 import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
-import { ShuttleGetterSetterRepository } from "../../repositories/ShuttleGetterSetterRepository";
+import { ShuttleGetterSetterRepository } from "../../repositories/shuttle/ShuttleGetterSetterRepository";
 import { supportedIntegrationTestSystems } from "../supportedIntegrationTestSystems";
 
 const redRoutePolylineCoordinates = [
diff --git a/src/notifications/schedulers/ETANotificationScheduler.ts b/src/notifications/schedulers/ETANotificationScheduler.ts
index 328f36c..2ecdb3f 100644
--- a/src/notifications/schedulers/ETANotificationScheduler.ts
+++ b/src/notifications/schedulers/ETANotificationScheduler.ts
@@ -1,11 +1,11 @@
-import { ShuttleGetterRepository } from "../../repositories/ShuttleGetterRepository";
+import { ShuttleGetterRepository } from "../../repositories/shuttle/ShuttleGetterRepository";
 import { IEta } from "../../entities/ShuttleRepositoryEntities";
 import { AppleNotificationSender, NotificationAlertArguments } from "../senders/AppleNotificationSender";
 import {
   NotificationRepository,
   ScheduledNotification
-} from "../../repositories/NotificationRepository";
-import { InMemoryNotificationRepository } from "../../repositories/InMemoryNotificationRepository";
+} from "../../repositories/notifications/NotificationRepository";
+import { InMemoryNotificationRepository } from "../../repositories/notifications/InMemoryNotificationRepository";
 
 export class ETANotificationScheduler {
   public static readonly defaultSecondsThresholdForNotificationToFire = 180;
diff --git a/src/repositories/InMemoryNotificationRepository.ts b/src/repositories/notifications/InMemoryNotificationRepository.ts
similarity index 98%
rename from src/repositories/InMemoryNotificationRepository.ts
rename to src/repositories/notifications/InMemoryNotificationRepository.ts
index 513f7b7..7e26a73 100644
--- a/src/repositories/InMemoryNotificationRepository.ts
+++ b/src/repositories/notifications/InMemoryNotificationRepository.ts
@@ -5,7 +5,7 @@ import {
   NotificationRepository,
   ScheduledNotification
 } from "./NotificationRepository";
-import { TupleKey } from "../types/TupleKey";
+import { TupleKey } from "../../types/TupleKey";
 
 type DeviceIdSecondsThresholdAssociation = { [key: string]: number };
 
diff --git a/src/repositories/NotificationRepository.ts b/src/repositories/notifications/NotificationRepository.ts
similarity index 100%
rename from src/repositories/NotificationRepository.ts
rename to src/repositories/notifications/NotificationRepository.ts
diff --git a/src/repositories/RedisNotificationRepository.ts b/src/repositories/notifications/RedisNotificationRepository.ts
similarity index 97%
rename from src/repositories/RedisNotificationRepository.ts
rename to src/repositories/notifications/RedisNotificationRepository.ts
index 6648642..2c7609e 100644
--- a/src/repositories/RedisNotificationRepository.ts
+++ b/src/repositories/notifications/RedisNotificationRepository.ts
@@ -1,4 +1,4 @@
-import { TupleKey } from '../types/TupleKey';
+import { TupleKey } from '../../types/TupleKey';
 import {
   Listener,
   NotificationEvent,
@@ -6,7 +6,7 @@ import {
   NotificationRepository,
   ScheduledNotification
 } from "./NotificationRepository";
-import { BaseRedisRepository } from "./BaseRedisRepository";
+import { BaseRedisRepository } from "../BaseRedisRepository";
 
 export class RedisNotificationRepository extends BaseRedisRepository implements NotificationRepository {
   private listeners: Listener[] = [];
diff --git a/src/repositories/InMemoryParkingRepository.ts b/src/repositories/parking/InMemoryParkingRepository.ts
similarity index 98%
rename from src/repositories/InMemoryParkingRepository.ts
rename to src/repositories/parking/InMemoryParkingRepository.ts
index 741cfd9..1aedad1 100644
--- a/src/repositories/InMemoryParkingRepository.ts
+++ b/src/repositories/parking/InMemoryParkingRepository.ts
@@ -2,9 +2,9 @@ import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository";
 import {
   IParkingStructure,
   IParkingStructureTimestampRecord
-} from "../entities/ParkingRepositoryEntities";
+} from "../../entities/ParkingRepositoryEntities";
 import { HistoricalParkingAverageQueryResult, ParkingStructureCountOptions } from "./ParkingGetterRepository";
-import { CircularQueue } from "../types/CircularQueue";
+import { CircularQueue } from "../../types/CircularQueue";
 import { PARKING_LOGGING_INTERVAL_MS } from "./ParkingRepositoryConstants";
 
 // If every 10 minutes, two weeks of data (6x per hour * 24x per day * 7x per week * 2)
diff --git a/src/repositories/ParkingGetterRepository.ts b/src/repositories/parking/ParkingGetterRepository.ts
similarity index 90%
rename from src/repositories/ParkingGetterRepository.ts
rename to src/repositories/parking/ParkingGetterRepository.ts
index 8ef13c9..3f464c2 100644
--- a/src/repositories/ParkingGetterRepository.ts
+++ b/src/repositories/parking/ParkingGetterRepository.ts
@@ -1,4 +1,4 @@
-import { IParkingStructure } from "../entities/ParkingRepositoryEntities";
+import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
 
 export interface ParkingStructureCountOptions {
   startUnixEpochMs: number;
diff --git a/src/repositories/ParkingGetterSetterRepository.ts b/src/repositories/parking/ParkingGetterSetterRepository.ts
similarity index 83%
rename from src/repositories/ParkingGetterSetterRepository.ts
rename to src/repositories/parking/ParkingGetterSetterRepository.ts
index 63b60e5..91d70c2 100644
--- a/src/repositories/ParkingGetterSetterRepository.ts
+++ b/src/repositories/parking/ParkingGetterSetterRepository.ts
@@ -1,4 +1,4 @@
-import { IParkingStructure } from "../entities/ParkingRepositoryEntities";
+import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
 import { ParkingGetterRepository } from "./ParkingGetterRepository";
 
 export interface ParkingGetterSetterRepository extends ParkingGetterRepository {
diff --git a/src/repositories/ParkingRepositoryConstants.ts b/src/repositories/parking/ParkingRepositoryConstants.ts
similarity index 100%
rename from src/repositories/ParkingRepositoryConstants.ts
rename to src/repositories/parking/ParkingRepositoryConstants.ts
diff --git a/src/repositories/RedisParkingRepository.ts b/src/repositories/parking/RedisParkingRepository.ts
similarity index 97%
rename from src/repositories/RedisParkingRepository.ts
rename to src/repositories/parking/RedisParkingRepository.ts
index fae968c..0e18d47 100644
--- a/src/repositories/RedisParkingRepository.ts
+++ b/src/repositories/parking/RedisParkingRepository.ts
@@ -1,7 +1,7 @@
 import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository";
-import { IParkingStructure } from "../entities/ParkingRepositoryEntities";
+import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
 import { HistoricalParkingAverageQueryResult, ParkingStructureCountOptions } from "./ParkingGetterRepository";
-import { BaseRedisRepository } from "./BaseRedisRepository";
+import { BaseRedisRepository } from "../BaseRedisRepository";
 import { PARKING_LOGGING_INTERVAL_MS } from "./ParkingRepositoryConstants";
 
 export type ParkingStructureID = string;
@@ -167,7 +167,7 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
 
     while (currentIntervalStart < endUnixEpochMs) {
       const currentIntervalEnd = Math.min(currentIntervalStart + intervalMs, endUnixEpochMs);
-      
+
       try {
         const aggregationResult = await this.redisClient.sendCommand([
           'TS.RANGE',
diff --git a/src/repositories/ShuttleGetterRepository.ts b/src/repositories/shuttle/ShuttleGetterRepository.ts
similarity index 97%
rename from src/repositories/ShuttleGetterRepository.ts
rename to src/repositories/shuttle/ShuttleGetterRepository.ts
index f705e15..20d0fdc 100644
--- a/src/repositories/ShuttleGetterRepository.ts
+++ b/src/repositories/shuttle/ShuttleGetterRepository.ts
@@ -1,4 +1,4 @@
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
 
 /**
  * Shuttle getter repository to be linked to a system.
diff --git a/src/repositories/ShuttleGetterSetterRepository.ts b/src/repositories/shuttle/ShuttleGetterSetterRepository.ts
similarity index 97%
rename from src/repositories/ShuttleGetterSetterRepository.ts
rename to src/repositories/shuttle/ShuttleGetterSetterRepository.ts
index 6f23bc1..24da9e1 100644
--- a/src/repositories/ShuttleGetterSetterRepository.ts
+++ b/src/repositories/shuttle/ShuttleGetterSetterRepository.ts
@@ -2,7 +2,7 @@
 // to convert from data repo to GraphQL schema
 
 import { ShuttleGetterRepository } from "./ShuttleGetterRepository";
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
 
 /**
  * ShuttleGetterRepository interface for data derived from Passio API.
diff --git a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts b/src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository.ts
similarity index 98%
rename from src/repositories/UnoptimizedInMemoryShuttleRepository.ts
rename to src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository.ts
index fd6c36f..52553cc 100644
--- a/src/repositories/UnoptimizedInMemoryShuttleRepository.ts
+++ b/src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository.ts
@@ -1,6 +1,6 @@
 import { ShuttleGetterSetterRepository } from "./ShuttleGetterSetterRepository";
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
-import { IEntityWithId } from "../entities/SharedEntities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
+import { IEntityWithId } from "../../entities/SharedEntities";
 
 /**
  * An unoptimized in memory repository.
diff --git a/src/resolvers/MutationResolvers.ts b/src/resolvers/MutationResolvers.ts
index 8d266c8..2543051 100644
--- a/src/resolvers/MutationResolvers.ts
+++ b/src/resolvers/MutationResolvers.ts
@@ -3,7 +3,7 @@ import { ServerContext } from "../ServerContext";
 import {
   ETANotificationScheduler,
 } from "../notifications/schedulers/ETANotificationScheduler";
-import { ScheduledNotification } from "../repositories/NotificationRepository";
+import { ScheduledNotification } from "../repositories/notifications/NotificationRepository";
 import { InterchangeSystem } from "../entities/InterchangeSystem";
 
 async function temp_findMatchingSystemBasedOnShuttleId(context: ServerContext, args: Omit<MutationScheduleNotificationArgs, "input"> & {
diff --git a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
index a57557d..c3dc0c4 100644
--- a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
+++ b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { TimedApiBasedRepositoryLoader } from "../../src/loaders/TimedApiBasedRepositoryLoader";
 import { resetGlobalFetchMockJson } from "../testHelpers/fetchMockHelpers";
-import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/UnoptimizedInMemoryShuttleRepository";
+import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
 import { ApiBasedShuttleRepositoryLoader } from "../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader";
 
 describe("TimedApiBasedRepositoryLoader", () => {
diff --git a/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts b/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
index ecd6a12..18f22d5 100644
--- a/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
+++ b/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import {
   ChapmanApiBasedParkingRepositoryLoader
 } from "../../../src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader";
-import { InMemoryParkingRepository } from "../../../src/repositories/InMemoryParkingRepository";
+import { InMemoryParkingRepository } from "../../../src/repositories/parking/InMemoryParkingRepository";
 import {
   resetGlobalFetchMockJson,
   updateGlobalFetchMockJson,
diff --git a/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts b/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
index d829732..6b55712 100644
--- a/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
+++ b/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { ApiBasedShuttleRepositoryLoader } from "../../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader";
-import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/UnoptimizedInMemoryShuttleRepository";
+import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
 import { fetchRouteDataSuccessfulResponse } from "../../jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse";
 import {
   fetchStopAndPolylineDataSuccessfulResponse
diff --git a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts b/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts
index 1c5b819..3fd9192 100644
--- a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts
+++ b/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts
@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { ETANotificationScheduler } from "../../../src/notifications/schedulers/ETANotificationScheduler";
-import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/UnoptimizedInMemoryShuttleRepository";
+import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
 import { IEta, IShuttle, IStop } from "../../../src/entities/ShuttleRepositoryEntities";
 import { addMockShuttleToRepository, addMockStopToRepository } from "../../testHelpers/repositorySetupHelpers";
 import { AppleNotificationSender } from "../../../src/notifications/senders/AppleNotificationSender";
-import { InMemoryNotificationRepository } from "../../../src/repositories/InMemoryNotificationRepository";
-import { NotificationRepository } from "../../../src/repositories/NotificationRepository";
+import { InMemoryNotificationRepository } from "../../../src/repositories/notifications/InMemoryNotificationRepository";
+import { NotificationRepository } from "../../../src/repositories/notifications/NotificationRepository";
 
 jest.mock("http2");
 jest.mock("../../../src/notifications/senders/AppleNotificationSender");
diff --git a/test/repositories/NotificationRepositorySharedTests.test.ts b/test/repositories/NotificationRepositorySharedTests.test.ts
index d8df44e..fc96674 100644
--- a/test/repositories/NotificationRepositorySharedTests.test.ts
+++ b/test/repositories/NotificationRepositorySharedTests.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
-import { InMemoryNotificationRepository } from "../../src/repositories/InMemoryNotificationRepository";
-import { NotificationEvent, NotificationRepository } from "../../src/repositories/NotificationRepository";
-import { RedisNotificationRepository } from "../../src/repositories/RedisNotificationRepository";
+import { InMemoryNotificationRepository } from "../../src/repositories/notifications/InMemoryNotificationRepository";
+import { NotificationEvent, NotificationRepository } from "../../src/repositories/notifications/NotificationRepository";
+import { RedisNotificationRepository } from "../../src/repositories/notifications/RedisNotificationRepository";
 
 interface RepositoryHolder {
   name: string;
diff --git a/test/repositories/ParkingRepositorySharedTests.test.ts b/test/repositories/ParkingRepositorySharedTests.test.ts
index c43cf07..e920083 100644
--- a/test/repositories/ParkingRepositorySharedTests.test.ts
+++ b/test/repositories/ParkingRepositorySharedTests.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
-import { InMemoryParkingRepository, } from "../../src/repositories/InMemoryParkingRepository";
+import { InMemoryParkingRepository, } from "../../src/repositories/parking/InMemoryParkingRepository";
 import { IParkingStructure } from "../../src/entities/ParkingRepositoryEntities";
-import { ParkingStructureCountOptions } from "../../src/repositories/ParkingGetterRepository";
-import { ParkingGetterSetterRepository } from "../../src/repositories/ParkingGetterSetterRepository";
-import { RedisParkingRepository } from "../../src/repositories/RedisParkingRepository";
+import { ParkingStructureCountOptions } from "../../src/repositories/parking/ParkingGetterRepository";
+import { ParkingGetterSetterRepository } from "../../src/repositories/parking/ParkingGetterSetterRepository";
+import { RedisParkingRepository } from "../../src/repositories/parking/RedisParkingRepository";
 
 interface RepositoryHolder {
   name: string;
diff --git a/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts b/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts
index e1d9ba7..c5a840d 100644
--- a/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts
+++ b/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, jest, test } from "@jest/globals";
-import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/UnoptimizedInMemoryShuttleRepository";
+import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
 import {
   generateMockEtas,
   generateMockOrderedStops,
diff --git a/test/resolvers/QueryResolverTests.test.ts b/test/resolvers/QueryResolverTests.test.ts
index 3bc3dae..c24cc61 100644
--- a/test/resolvers/QueryResolverTests.test.ts
+++ b/test/resolvers/QueryResolverTests.test.ts
@@ -6,7 +6,7 @@ import {
 } from "../testHelpers/apolloTestServerHelpers";
 import assert = require("node:assert");
 import { addMockShuttleToRepository, addMockStopToRepository } from "../testHelpers/repositorySetupHelpers";
-import { ScheduledNotification } from "../../src/repositories/NotificationRepository";
+import { ScheduledNotification } from "../../src/repositories/notifications/NotificationRepository";
 
 // See Apollo documentation for integration test guide
 // https://www.apollographql.com/docs/apollo-server/testing/testing
diff --git a/test/testHelpers/repositorySetupHelpers.ts b/test/testHelpers/repositorySetupHelpers.ts
index 85e5e1e..c262ab1 100644
--- a/test/testHelpers/repositorySetupHelpers.ts
+++ b/test/testHelpers/repositorySetupHelpers.ts
@@ -4,7 +4,7 @@ import {
   generateMockShuttles,
   generateMockStops,
 } from "./mockDataGenerators";
-import { ShuttleGetterSetterRepository } from "../../src/repositories/ShuttleGetterSetterRepository";
+import { ShuttleGetterSetterRepository } from "../../src/repositories/shuttle/ShuttleGetterSetterRepository";
 
 export async function addMockRouteToRepository(repository: ShuttleGetterSetterRepository, systemId: string) {
   const mockRoutes = generateMockRoutes();