diff --git a/src/store/airhorn-store.ts b/src/airhorn-store.ts
similarity index 98%
rename from src/store/airhorn-store.ts
rename to src/airhorn-store.ts
index 11dd7bc..713c5dd 100644
--- a/src/store/airhorn-store.ts
+++ b/src/airhorn-store.ts
@@ -1,4 +1,4 @@
-import { type AirhornProviderType } from '../provider-type.js';
+import { type AirhornProviderType } from './provider-type.js';
 
 export type AirhornSubscription = {
 	id: string;
diff --git a/src/airhorn.ts b/src/airhorn.ts
index b78cbbe..0fc9cac 100644
--- a/src/airhorn.ts
+++ b/src/airhorn.ts
@@ -74,4 +74,4 @@ export class Airhorn {
 export { AirhornProviderType } from './provider-type.js';
 export {
 	AirhornStore, type AirhornNotification, type AirhornStoreProvider, type AirhornNotificationStatus,
-} from './store/airhorn-store.js';
+} from './airhorn-store.js';
diff --git a/src/store/mongo-store-provider.ts b/src/store-providers/mongo.ts
similarity index 99%
rename from src/store/mongo-store-provider.ts
rename to src/store-providers/mongo.ts
index 60a7e7b..65b0dcb 100644
--- a/src/store/mongo-store-provider.ts
+++ b/src/store-providers/mongo.ts
@@ -6,7 +6,7 @@ import { type AirhornStoreProvider } from '../airhorn.js';
 import {
 	type AirhornSubscription, type AirhornNotification, type AirhornNotificationStatus, type CreateAirhornNotification,
 	type CreateAirhornSubscription,
-} from './airhorn-store.js';
+} from '../airhorn-store.js';
 
 export type MongoStoreProviderOptions = {
 	uri?: string;
diff --git a/test/store/airhorn-store.test.ts b/test/airhorn-store.test.ts
similarity index 96%
rename from test/store/airhorn-store.test.ts
rename to test/airhorn-store.test.ts
index 416d111..8accfb8 100644
--- a/test/store/airhorn-store.test.ts
+++ b/test/airhorn-store.test.ts
@@ -1,7 +1,7 @@
 import {test, describe, expect} from 'vitest';
-import {type CreateAirhornNotification, AirhornStore, AirhornNotificationStatus} from '../../src/store/airhorn-store.js';
-import { MongoStoreProvider } from '../../src/store/mongo-store-provider.js';
-import { AirhornProviderType } from '../../src/provider-type.js';
+import {type CreateAirhornNotification, AirhornStore, AirhornNotificationStatus} from '../src/airhorn-store.js';
+import { MongoStoreProvider } from '../src/store-providers/mongo.js';
+import { AirhornProviderType } from '../src/provider-type.js';
 
 const mongoUri = 'mongodb://localhost:27017/airhorn';
 
diff --git a/test/store/mongo-store-provider.test.ts b/test/store-providers/mongo.test.ts
similarity index 99%
rename from test/store/mongo-store-provider.test.ts
rename to test/store-providers/mongo.test.ts
index 87ac670..d379f78 100644
--- a/test/store/mongo-store-provider.test.ts
+++ b/test/store-providers/mongo.test.ts
@@ -1,7 +1,7 @@
 import {test, describe, expect} from 'vitest';
 import { ObjectId } from 'mongodb';
-import {MongoStoreProvider} from '../../src/store/mongo-store-provider.js';
-import { AirhornNotificationStatus } from '../../src/store/airhorn-store.js';
+import {MongoStoreProvider} from '../../src/store-providers/mongo.js';
+import { AirhornNotificationStatus } from '../../src/airhorn-store.js';
 import { AirhornProviderType } from '../../src/provider-type.js';
 
 const uri = 'mongodb://localhost:27017';