diff --git a/src/stores/coordinators/__tests__/authAutoLoginCoordinator.test.js b/src/coordinators/__tests__/authAutoLoginCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/authAutoLoginCoordinator.test.js
rename to src/coordinators/__tests__/authAutoLoginCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/authCoordinator.test.js b/src/coordinators/__tests__/authCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/authCoordinator.test.js
rename to src/coordinators/__tests__/authCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/friendPresenceCoordinator.test.js b/src/coordinators/__tests__/friendPresenceCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/friendPresenceCoordinator.test.js
rename to src/coordinators/__tests__/friendPresenceCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/friendRelationshipCoordinator.test.js b/src/coordinators/__tests__/friendRelationshipCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/friendRelationshipCoordinator.test.js
rename to src/coordinators/__tests__/friendRelationshipCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/friendSyncCoordinator.test.js b/src/coordinators/__tests__/friendSyncCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/friendSyncCoordinator.test.js
rename to src/coordinators/__tests__/friendSyncCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/gameCoordinator.test.js b/src/coordinators/__tests__/gameCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/gameCoordinator.test.js
rename to src/coordinators/__tests__/gameCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/userEventCoordinator.test.js b/src/coordinators/__tests__/userEventCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/userEventCoordinator.test.js
rename to src/coordinators/__tests__/userEventCoordinator.test.js
diff --git a/src/stores/coordinators/__tests__/userSessionCoordinator.test.js b/src/coordinators/__tests__/userSessionCoordinator.test.js
similarity index 100%
rename from src/stores/coordinators/__tests__/userSessionCoordinator.test.js
rename to src/coordinators/__tests__/userSessionCoordinator.test.js
diff --git a/src/stores/coordinators/authAutoLoginCoordinator.js b/src/coordinators/authAutoLoginCoordinator.js
similarity index 100%
rename from src/stores/coordinators/authAutoLoginCoordinator.js
rename to src/coordinators/authAutoLoginCoordinator.js
diff --git a/src/stores/coordinators/authCoordinator.js b/src/coordinators/authCoordinator.js
similarity index 100%
rename from src/stores/coordinators/authCoordinator.js
rename to src/coordinators/authCoordinator.js
diff --git a/src/stores/coordinators/friendPresenceCoordinator.js b/src/coordinators/friendPresenceCoordinator.js
similarity index 100%
rename from src/stores/coordinators/friendPresenceCoordinator.js
rename to src/coordinators/friendPresenceCoordinator.js
diff --git a/src/stores/coordinators/friendRelationshipCoordinator.js b/src/coordinators/friendRelationshipCoordinator.js
similarity index 100%
rename from src/stores/coordinators/friendRelationshipCoordinator.js
rename to src/coordinators/friendRelationshipCoordinator.js
diff --git a/src/stores/coordinators/friendSyncCoordinator.js b/src/coordinators/friendSyncCoordinator.js
similarity index 100%
rename from src/stores/coordinators/friendSyncCoordinator.js
rename to src/coordinators/friendSyncCoordinator.js
diff --git a/src/stores/coordinators/gameCoordinator.js b/src/coordinators/gameCoordinator.js
similarity index 100%
rename from src/stores/coordinators/gameCoordinator.js
rename to src/coordinators/gameCoordinator.js
diff --git a/src/stores/coordinators/userEventCoordinator.js b/src/coordinators/userEventCoordinator.js
similarity index 100%
rename from src/stores/coordinators/userEventCoordinator.js
rename to src/coordinators/userEventCoordinator.js
diff --git a/src/stores/coordinators/userSessionCoordinator.js b/src/coordinators/userSessionCoordinator.js
similarity index 100%
rename from src/stores/coordinators/userSessionCoordinator.js
rename to src/coordinators/userSessionCoordinator.js
diff --git a/src/stores/auth.js b/src/stores/auth.js
index cca7342a..cea0b13c 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -8,8 +8,8 @@ import Noty from 'noty';
 import { closeWebSocket, initWebsocket } from '../service/websocket';
 import { AppDebug } from '../service/appConfig';
 import { authRequest } from '../api';
-import { createAuthAutoLoginCoordinator } from './coordinators/authAutoLoginCoordinator';
-import { createAuthCoordinator } from './coordinators/authCoordinator';
+import { createAuthAutoLoginCoordinator } from '../coordinators/authAutoLoginCoordinator';
+import { createAuthCoordinator } from '../coordinators/authCoordinator';
 import { database } from '../service/database';
 import { escapeTag } from '../shared/utils';
 import { queryClient } from '../queries';
diff --git a/src/stores/friend.js b/src/stores/friend.js
index e9811152..91c0090e 100644
--- a/src/stores/friend.js
+++ b/src/stores/friend.js
@@ -18,9 +18,9 @@ import {
 } from '../shared/utils';
 import { friendRequest, userRequest } from '../api';
 import { AppDebug } from '../service/appConfig';
-import { createFriendPresenceCoordinator } from './coordinators/friendPresenceCoordinator';
-import { createFriendRelationshipCoordinator } from './coordinators/friendRelationshipCoordinator';
-import { createFriendSyncCoordinator } from './coordinators/friendSyncCoordinator';
+import { createFriendPresenceCoordinator } from '../coordinators/friendPresenceCoordinator';
+import { createFriendRelationshipCoordinator } from '../coordinators/friendRelationshipCoordinator';
+import { createFriendSyncCoordinator } from '../coordinators/friendSyncCoordinator';
 import { database } from '../service/database';
 import { reconnectWebSocket } from '../service/websocket';
 import { useAppearanceSettingsStore } from './settings/appearance';
diff --git a/src/stores/game.js b/src/stores/game.js
index a27c71d0..eda02a06 100644
--- a/src/stores/game.js
+++ b/src/stores/game.js
@@ -6,7 +6,7 @@ import {
     deleteVRChatCache as _deleteVRChatCache,
     isRealInstance
 } from '../shared/utils';
-import { createGameCoordinator } from './coordinators/gameCoordinator';
+import { createGameCoordinator } from '../coordinators/gameCoordinator';
 import { database } from '../service/database';
 import { useAdvancedSettingsStore } from './settings/advanced';
 import { useAvatarStore } from './avatar';
diff --git a/src/stores/user.js b/src/stores/user.js
index 60a23472..6a5d9346 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -34,8 +34,8 @@ import {
 } from '../api';
 import { processBulk, request } from '../service/request';
 import { AppDebug } from '../service/appConfig';
-import { createUserEventCoordinator } from './coordinators/userEventCoordinator';
-import { createUserSessionCoordinator } from './coordinators/userSessionCoordinator';
+import { createUserEventCoordinator } from '../coordinators/userEventCoordinator';
+import { createUserSessionCoordinator } from '../coordinators/userSessionCoordinator';
 import { database } from '../service/database';
 import { patchUserFromEvent } from '../queries';
 import { useAppearanceSettingsStore } from './settings/appearance';