diff --git a/src/entities/InterchangeSystem.ts b/src/entities/InterchangeSystem.ts
index 6bd743a..d1a33c4 100644
--- a/src/entities/InterchangeSystem.ts
+++ b/src/entities/InterchangeSystem.ts
@@ -6,7 +6,7 @@ import { NotificationRepository } from "../repositories/NotificationRepository";
 import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
 import { InMemoryNotificationRepository } from "../repositories/InMemoryNotificationRepository";
 import { AppleNotificationSender } from "../notifications/senders/AppleNotificationSender";
-import { ApiBasedShuttleRepositoryLoader } from "../loaders/ApiBasedShuttleRepositoryLoader";
+import { ApiBasedShuttleRepositoryLoader } from "../loaders/shuttle/ApiBasedShuttleRepositoryLoader";
 
 export interface InterchangeSystemBuilderArguments {
   name: string;
diff --git a/src/index.ts b/src/index.ts
index a370258..00cd04b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,7 +3,7 @@ import { ApolloServer } from "@apollo/server";
 import { startStandaloneServer } from "@apollo/server/standalone";
 import { MergedResolvers } from "./MergedResolvers";
 import { ServerContext } from "./ServerContext";
-import { loadShuttleTestData, supportedIntegrationTestSystems } from "./loaders/loadShuttleTestData";
+import { loadShuttleTestData, supportedIntegrationTestSystems } from "./loaders/shuttle/loadShuttleTestData";
 import { InterchangeSystem, InterchangeSystemBuilderArguments } from "./entities/InterchangeSystem";
 
 const typeDefs = readFileSync("./schema.graphqls", "utf8");
diff --git a/src/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoader.ts b/src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts
similarity index 100%
rename from src/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoader.ts
rename to src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader.ts
diff --git a/src/loaders/ParkingRepositoryLoaders/ParkingRepositoryLoader.ts b/src/loaders/parking/ParkingRepositoryLoader.ts
similarity index 100%
rename from src/loaders/ParkingRepositoryLoaders/ParkingRepositoryLoader.ts
rename to src/loaders/parking/ParkingRepositoryLoader.ts
diff --git a/src/loaders/ParkingRepositoryLoaders/buildParkingRepositoryLoaderIfExists.ts b/src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts
similarity index 100%
rename from src/loaders/ParkingRepositoryLoaders/buildParkingRepositoryLoaderIfExists.ts
rename to src/loaders/parking/buildParkingRepositoryLoaderIfExists.ts
diff --git a/src/loaders/ApiBasedShuttleRepositoryLoader.ts b/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
similarity index 97%
rename from src/loaders/ApiBasedShuttleRepositoryLoader.ts
rename to src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
index e02bed4..062ff43 100644
--- a/src/loaders/ApiBasedShuttleRepositoryLoader.ts
+++ b/src/loaders/shuttle/ApiBasedShuttleRepositoryLoader.ts
@@ -1,8 +1,8 @@
-import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { IEta, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
+import { ShuttleGetterSetterRepository } from "../../repositories/ShuttleGetterSetterRepository";
+import { IEta, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
 import { ShuttleRepositoryLoader } from "./ShuttleRepositoryLoader";
-import { IEntityWithId } from "../entities/SharedEntities";
-import { ApiResponseError } from "./ApiResponseError";
+import { IEntityWithId } from "../../entities/SharedEntities";
+import { ApiResponseError } from "../ApiResponseError";
 
 /**
  * Class which can load data into a repository from the
diff --git a/src/loaders/ShuttleRepositoryLoader.ts b/src/loaders/shuttle/ShuttleRepositoryLoader.ts
similarity index 87%
rename from src/loaders/ShuttleRepositoryLoader.ts
rename to src/loaders/shuttle/ShuttleRepositoryLoader.ts
index 100cecc..382c97e 100644
--- a/src/loaders/ShuttleRepositoryLoader.ts
+++ b/src/loaders/shuttle/ShuttleRepositoryLoader.ts
@@ -1,4 +1,4 @@
-import { RepositoryLoader } from "./RepositoryLoader";
+import { RepositoryLoader } from "../RepositoryLoader";
 
 export interface ShuttleRepositoryLoader extends RepositoryLoader {
   fetchAndUpdateRouteDataForSystem(): Promise<void>;
diff --git a/src/loaders/loadShuttleTestData.ts b/src/loaders/shuttle/loadShuttleTestData.ts
similarity index 99%
rename from src/loaders/loadShuttleTestData.ts
rename to src/loaders/shuttle/loadShuttleTestData.ts
index b97c99d..c7603bf 100644
--- a/src/loaders/loadShuttleTestData.ts
+++ b/src/loaders/shuttle/loadShuttleTestData.ts
@@ -1,7 +1,7 @@
 // Mock data
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../entities/ShuttleRepositoryEntities";
-import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
-import { InterchangeSystemBuilderArguments } from "../entities/InterchangeSystem";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
+import { ShuttleGetterSetterRepository } from "../../repositories/ShuttleGetterSetterRepository";
+import { InterchangeSystemBuilderArguments } from "../../entities/InterchangeSystem";
 
 export const supportedIntegrationTestSystems: InterchangeSystemBuilderArguments[] = [
   {
diff --git a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
index e62f6ad..a57557d 100644
--- a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
+++ b/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, jest } from "@j
 import { TimedApiBasedRepositoryLoader } from "../../src/loaders/TimedApiBasedRepositoryLoader";
 import { resetGlobalFetchMockJson } from "../testHelpers/fetchMockHelpers";
 import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/UnoptimizedInMemoryShuttleRepository";
-import { ApiBasedShuttleRepositoryLoader } from "../../src/loaders/ApiBasedShuttleRepositoryLoader";
+import { ApiBasedShuttleRepositoryLoader } from "../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader";
 
 describe("TimedApiBasedRepositoryLoader", () => {
   let timedLoader: TimedApiBasedRepositoryLoader;
diff --git a/test/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts b/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
similarity index 96%
rename from test/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
rename to test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
index b817d98..55d82c5 100644
--- a/test/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
+++ b/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import {
   ChapmanApiBasedParkingRepositoryLoader
-} from "../../../src/loaders/ParkingRepositoryLoaders/ChapmanApiBasedParkingRepositoryLoader";
+} from "../../../src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader";
 import { InMemoryParkingRepository } from "../../../src/repositories/InMemoryParkingRepository";
 import {
   resetGlobalFetchMockJson,
diff --git a/test/loaders/ApiBasedShuttleRepositoryLoaderTests.test.ts b/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
similarity index 88%
rename from test/loaders/ApiBasedShuttleRepositoryLoaderTests.test.ts
rename to test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
index ee93aa3..d829732 100644
--- a/test/loaders/ApiBasedShuttleRepositoryLoaderTests.test.ts
+++ b/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts
@@ -1,21 +1,21 @@
 import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
-import { ApiBasedShuttleRepositoryLoader } from "../../src/loaders/ApiBasedShuttleRepositoryLoader";
-import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/UnoptimizedInMemoryShuttleRepository";
-import { fetchRouteDataSuccessfulResponse } from "../jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse";
+import { ApiBasedShuttleRepositoryLoader } from "../../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader";
+import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/UnoptimizedInMemoryShuttleRepository";
+import { fetchRouteDataSuccessfulResponse } from "../../jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse";
 import {
   fetchStopAndPolylineDataSuccessfulResponse
-} from "../jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse";
-import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../testHelpers/mockDataGenerators";
+} from "../../jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse";
+import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../../testHelpers/mockDataGenerators";
 import {
   fetchShuttleDataSuccessfulResponse
-} from "../jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse";
-import { fetchEtaDataSuccessfulResponse } from "../jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse";
+} from "../../jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse";
+import { fetchEtaDataSuccessfulResponse } from "../../jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse";
 import {
   resetGlobalFetchMockJson,
   updateGlobalFetchMockJson,
   updateGlobalFetchMockJsonToThrowSyntaxError
-} from "../testHelpers/fetchMockHelpers";
-import { assertAsyncCallbackThrowsApiResponseError } from "../testHelpers/assertAsyncCallbackThrowsApiResponseError";
+} from "../../testHelpers/fetchMockHelpers";
+import { assertAsyncCallbackThrowsApiResponseError } from "../../testHelpers/assertAsyncCallbackThrowsApiResponseError";
 
 describe("ApiBasedShuttleRepositoryLoader", () => {
   let loader: ApiBasedShuttleRepositoryLoader;