diff --git a/src/index.ts b/src/index.ts
index b7fd3fe..c79732d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,10 +2,10 @@ import { readFileSync } from "fs";
 import { ApolloServer } from "@apollo/server";
 import { startStandaloneServer } from "@apollo/server/standalone";
 import { resolvers } from "./resolvers";
-import { loadTestData } from "./testData";
+import { loadTestData } from "./loaders/testData";
 import { ServerContext } from "./serverContext";
-import { UnoptimizedInMemoryRepository } from "./unoptimizedInMemoryRepository";
-import { RepositoryDataLoader } from "./repositoryDataLoader";
+import { UnoptimizedInMemoryRepository } from "./repositories/unoptimizedInMemoryRepository";
+import { RepositoryDataLoader } from "./loaders/repositoryDataLoader";
 
 const typeDefs = readFileSync("./schema.graphqls", "utf8");
 
diff --git a/src/repositoryDataLoader.ts b/src/loaders/repositoryDataLoader.ts
similarity index 99%
rename from src/repositoryDataLoader.ts
rename to src/loaders/repositoryDataLoader.ts
index 2caa4c2..ea5aa84 100644
--- a/src/repositoryDataLoader.ts
+++ b/src/loaders/repositoryDataLoader.ts
@@ -1,4 +1,4 @@
-import { IOrderedStop, IRoute, IShuttle, IStop, ISystem, Repository } from "./repository";
+import { IOrderedStop, IRoute, IShuttle, IStop, ISystem, Repository } from "../repositories/repository";
 
 const timeout = 10000;
 const systemIdsToSupport = ["263"];
diff --git a/src/testData.ts b/src/loaders/testData.ts
similarity index 98%
rename from src/testData.ts
rename to src/loaders/testData.ts
index 975308c..a346130 100644
--- a/src/testData.ts
+++ b/src/loaders/testData.ts
@@ -1,5 +1,5 @@
 // Mock data
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop, ISystem, Repository } from "./repository";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop, ISystem, Repository } from "../repositories/repository";
 
 const systems: ISystem[] = [
   {
diff --git a/src/repository.ts b/src/repositories/repository.ts
similarity index 100%
rename from src/repository.ts
rename to src/repositories/repository.ts
diff --git a/src/unoptimizedInMemoryRepository.ts b/src/repositories/unoptimizedInMemoryRepository.ts
similarity index 100%
rename from src/unoptimizedInMemoryRepository.ts
rename to src/repositories/unoptimizedInMemoryRepository.ts
diff --git a/src/serverContext.ts b/src/serverContext.ts
index abc0a66..895560c 100644
--- a/src/serverContext.ts
+++ b/src/serverContext.ts
@@ -1,4 +1,4 @@
-import { Repository } from "./repository";
+import { Repository } from "./repositories/repository";
 
 export interface ServerContext {
   repository: Repository