diff --git a/src/entities/Font/model/store/batchFontStore.svelte.ts b/src/entities/Font/model/store/batchFontStore/batchFontStore.svelte.ts
similarity index 94%
rename from src/entities/Font/model/store/batchFontStore.svelte.ts
rename to src/entities/Font/model/store/batchFontStore/batchFontStore.svelte.ts
index 79a4846..7b0e9fe 100644
--- a/src/entities/Font/model/store/batchFontStore.svelte.ts
+++ b/src/entities/Font/model/store/batchFontStore/batchFontStore.svelte.ts
@@ -3,12 +3,12 @@ import { BaseQueryStore } from '$shared/lib/helpers/BaseQueryStore.svelte';
 import {
     fetchFontsByIds,
     seedFontCache,
-} from '../../api/proxy/proxyFonts';
+} from '../../../api/proxy/proxyFonts';
 import {
     FontNetworkError,
     FontResponseError,
-} from '../../lib/errors/errors';
-import type { UnifiedFont } from '../../model/types';
+} from '../../../lib/errors/errors';
+import type { UnifiedFont } from '../../types';
 
 /**
  * Internal fetcher that seeds the cache and handles error wrapping.
diff --git a/src/entities/Font/model/store/batchFontStore.test.ts b/src/entities/Font/model/store/batchFontStore/batchFontStore.test.ts
similarity index 97%
rename from src/entities/Font/model/store/batchFontStore.test.ts
rename to src/entities/Font/model/store/batchFontStore/batchFontStore.test.ts
index 2045d9d..3b112ac 100644
--- a/src/entities/Font/model/store/batchFontStore.test.ts
+++ b/src/entities/Font/model/store/batchFontStore/batchFontStore.test.ts
@@ -7,11 +7,11 @@ import {
     it,
     vi,
 } from 'vitest';
-import * as api from '../../api/proxy/proxyFonts';
+import * as api from '../../../api/proxy/proxyFonts';
 import {
     FontNetworkError,
     FontResponseError,
-} from '../../lib/errors/errors';
+} from '../../../lib/errors/errors';
 import { BatchFontStore } from './batchFontStore.svelte';
 
 describe('BatchFontStore', () => {
diff --git a/src/entities/Font/model/store/index.ts b/src/entities/Font/model/store/index.ts
index 3ef8061..48dd140 100644
--- a/src/entities/Font/model/store/index.ts
+++ b/src/entities/Font/model/store/index.ts
@@ -2,7 +2,7 @@
 export * from './appliedFontsStore/appliedFontsStore.svelte';
 
 // Batch font store
-export { BatchFontStore } from './batchFontStore.svelte';
+export { BatchFontStore } from './batchFontStore/batchFontStore.svelte';
 
 // Single FontStore
 export {