diff --git a/src/stores/__tests__/authAutoLoginCoordinator.test.js b/src/stores/coordinators/__tests__/authAutoLoginCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/authAutoLoginCoordinator.test.js
rename to src/stores/coordinators/__tests__/authAutoLoginCoordinator.test.js
index cc76524a..5b1f1e7e 100644
--- a/src/stores/__tests__/authAutoLoginCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/authAutoLoginCoordinator.test.js
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { createAuthAutoLoginCoordinator } from '../coordinators/authAutoLoginCoordinator';
+import { createAuthAutoLoginCoordinator } from '../authAutoLoginCoordinator';
 
 /**
  *
diff --git a/src/stores/__tests__/authCoordinator.test.js b/src/stores/coordinators/__tests__/authCoordinator.test.js
similarity index 97%
rename from src/stores/__tests__/authCoordinator.test.js
rename to src/stores/coordinators/__tests__/authCoordinator.test.js
index 215f3ba0..83a7a8bf 100644
--- a/src/stores/__tests__/authCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/authCoordinator.test.js
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { createAuthCoordinator } from '../coordinators/authCoordinator';
+import { createAuthCoordinator } from '../authCoordinator';
 
 /**
  *
diff --git a/src/stores/__tests__/friendPresenceCoordinator.test.js b/src/stores/coordinators/__tests__/friendPresenceCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/friendPresenceCoordinator.test.js
rename to src/stores/coordinators/__tests__/friendPresenceCoordinator.test.js
index ccd807b1..17a89d0e 100644
--- a/src/stores/__tests__/friendPresenceCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/friendPresenceCoordinator.test.js
@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from 'vitest';
 
-import { createFriendPresenceCoordinator } from '../coordinators/friendPresenceCoordinator';
+import { createFriendPresenceCoordinator } from '../friendPresenceCoordinator';
 
 /**
  * @returns {object} Mock dependencies and mutable state for friend presence tests.
diff --git a/src/stores/__tests__/friendRelationshipCoordinator.test.js b/src/stores/coordinators/__tests__/friendRelationshipCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/friendRelationshipCoordinator.test.js
rename to src/stores/coordinators/__tests__/friendRelationshipCoordinator.test.js
index 86b1580b..d7e49b0d 100644
--- a/src/stores/__tests__/friendRelationshipCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/friendRelationshipCoordinator.test.js
@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from 'vitest';
 
-import { createFriendRelationshipCoordinator } from '../coordinators/friendRelationshipCoordinator';
+import { createFriendRelationshipCoordinator } from '../friendRelationshipCoordinator';
 
 /**
  * @returns {Promise<void>} Promise flush helper.
diff --git a/src/stores/__tests__/friendSyncCoordinator.test.js b/src/stores/coordinators/__tests__/friendSyncCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/friendSyncCoordinator.test.js
rename to src/stores/coordinators/__tests__/friendSyncCoordinator.test.js
index 281cebc7..2aa1fc39 100644
--- a/src/stores/__tests__/friendSyncCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/friendSyncCoordinator.test.js
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { createFriendSyncCoordinator } from '../coordinators/friendSyncCoordinator';
+import { createFriendSyncCoordinator } from '../friendSyncCoordinator';
 
 /**
  *
diff --git a/src/stores/__tests__/gameCoordinator.test.js b/src/stores/coordinators/__tests__/gameCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/gameCoordinator.test.js
rename to src/stores/coordinators/__tests__/gameCoordinator.test.js
index 6884482c..88e9cd15 100644
--- a/src/stores/__tests__/gameCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/gameCoordinator.test.js
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { createGameCoordinator } from '../coordinators/gameCoordinator';
+import { createGameCoordinator } from '../gameCoordinator';
 
 /**
  *
diff --git a/src/stores/__tests__/userEventCoordinator.test.js b/src/stores/coordinators/__tests__/userEventCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/userEventCoordinator.test.js
rename to src/stores/coordinators/__tests__/userEventCoordinator.test.js
index 8966c782..b412e43b 100644
--- a/src/stores/__tests__/userEventCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/userEventCoordinator.test.js
@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from 'vitest';
 
-import { createUserEventCoordinator } from '../coordinators/userEventCoordinator';
+import { createUserEventCoordinator } from '../userEventCoordinator';
 
 /**
  * @returns {object} Mock dependencies for user event tests.
diff --git a/src/stores/__tests__/userSessionCoordinator.test.js b/src/stores/coordinators/__tests__/userSessionCoordinator.test.js
similarity index 98%
rename from src/stores/__tests__/userSessionCoordinator.test.js
rename to src/stores/coordinators/__tests__/userSessionCoordinator.test.js
index 134be238..c864483c 100644
--- a/src/stores/__tests__/userSessionCoordinator.test.js
+++ b/src/stores/coordinators/__tests__/userSessionCoordinator.test.js
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import { createUserSessionCoordinator } from '../coordinators/userSessionCoordinator';
+import { createUserSessionCoordinator } from '../userSessionCoordinator';
 
 /**
  *