diff --git a/src/mocks/data/crew.ts b/src/mocks/data/crew.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/mocks/data/game.ts b/src/mocks/data/game.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/mocks/data/member.ts b/src/mocks/data/member.ts
new file mode 100644
index 00000000..3c1916e2
--- /dev/null
+++ b/src/mocks/data/member.ts
@@ -0,0 +1 @@
+export const memberHandlers = [];
diff --git a/src/mocks/data/other.ts b/src/mocks/data/other.ts
new file mode 100644
index 00000000..0b09df27
--- /dev/null
+++ b/src/mocks/data/other.ts
@@ -0,0 +1 @@
+export const otherHandlers = [];
diff --git a/src/mocks/handlers.ts b/src/mocks/handlers/apiTest.ts
similarity index 83%
rename from src/mocks/handlers.ts
rename to src/mocks/handlers/apiTest.ts
index 4f375fce..7a3748c3 100644
--- a/src/mocks/handlers.ts
+++ b/src/mocks/handlers/apiTest.ts
@@ -1,6 +1,6 @@
 import { HttpResponse, http } from 'msw';
 
-export const handlers = [
+export const testHandlers = [
   http.get('/api/test', () => {
     return HttpResponse.json('Hello world!', { status: 200 });
   }),
diff --git a/src/mocks/handlers/crew.ts b/src/mocks/handlers/crew.ts
new file mode 100644
index 00000000..465c2a29
--- /dev/null
+++ b/src/mocks/handlers/crew.ts
@@ -0,0 +1 @@
+export const crewHandlers = [];
diff --git a/src/mocks/handlers/game.ts b/src/mocks/handlers/game.ts
new file mode 100644
index 00000000..98426cd1
--- /dev/null
+++ b/src/mocks/handlers/game.ts
@@ -0,0 +1 @@
+export const gameHandlers = [];
diff --git a/src/mocks/handlers/index.ts b/src/mocks/handlers/index.ts
new file mode 100644
index 00000000..9faa3326
--- /dev/null
+++ b/src/mocks/handlers/index.ts
@@ -0,0 +1,13 @@
+import { testHandlers } from './apiTest';
+import { crewHandlers } from './crew';
+import { gameHandlers } from './game';
+import { memberHandlers } from './member';
+import { otherHandlers } from './other';
+
+export const handlers = [
+  ...testHandlers,
+  ...gameHandlers,
+  ...crewHandlers,
+  ...memberHandlers,
+  ...otherHandlers,
+];
diff --git a/src/mocks/handlers/member.ts b/src/mocks/handlers/member.ts
new file mode 100644
index 00000000..3c1916e2
--- /dev/null
+++ b/src/mocks/handlers/member.ts
@@ -0,0 +1 @@
+export const memberHandlers = [];
diff --git a/src/mocks/handlers/other.ts b/src/mocks/handlers/other.ts
new file mode 100644
index 00000000..0b09df27
--- /dev/null
+++ b/src/mocks/handlers/other.ts
@@ -0,0 +1 @@
+export const otherHandlers = [];