diff --git a/src/entities/Font/lib/errors/errors.test.ts b/src/entities/Font/lib/errors/errors.test.ts
index 1a1e22e..a24c000 100644
--- a/src/entities/Font/lib/errors/errors.test.ts
+++ b/src/entities/Font/lib/errors/errors.test.ts
@@ -1,7 +1,7 @@
 import {
     FontNetworkError,
     FontResponseError,
-} from './index';
+} from './errors';
 
 describe('FontNetworkError', () => {
     it('has correct name', () => {
diff --git a/src/entities/Font/lib/errors/index.ts b/src/entities/Font/lib/errors/errors.ts
similarity index 100%
rename from src/entities/Font/lib/errors/index.ts
rename to src/entities/Font/lib/errors/errors.ts
diff --git a/src/entities/Font/model/store/baseFontStore.svelte.ts b/src/entities/Font/model/store/baseFontStore/baseFontStore.svelte.ts
similarity index 99%
rename from src/entities/Font/model/store/baseFontStore.svelte.ts
rename to src/entities/Font/model/store/baseFontStore/baseFontStore.svelte.ts
index 07c9d82..1db26ac 100644
--- a/src/entities/Font/model/store/baseFontStore.svelte.ts
+++ b/src/entities/Font/model/store/baseFontStore/baseFontStore.svelte.ts
@@ -5,7 +5,7 @@ import {
     type QueryObserverOptions,
     type QueryObserverResult,
 } from '@tanstack/query-core';
-import type { UnifiedFont } from '../types';
+import type { UnifiedFont } from '../../types';
 
 /**
  * Base class for font stores using TanStack Query
diff --git a/src/entities/Font/model/store/index.ts b/src/entities/Font/model/store/index.ts
index 0e2e684..4f0fc38 100644
--- a/src/entities/Font/model/store/index.ts
+++ b/src/entities/Font/model/store/index.ts
@@ -11,7 +11,7 @@ export {
     createUnifiedFontStore,
     type UnifiedFontStore,
     unifiedFontStore,
-} from './unifiedFontStore.svelte';
+} from './unifiedFontStore/unifiedFontStore.svelte';
 
 // Applied fonts manager (CSS loading - unchanged)
 export { appliedFontsManager } from './appliedFontsStore/appliedFontsStore.svelte';
diff --git a/src/entities/Font/model/store/unifiedFontStore.svelte.ts b/src/entities/Font/model/store/unifiedFontStore/unifiedFontStore.svelte.ts
similarity index 97%
rename from src/entities/Font/model/store/unifiedFontStore.svelte.ts
rename to src/entities/Font/model/store/unifiedFontStore/unifiedFontStore.svelte.ts
index 33c7f07..8ba082f 100644
--- a/src/entities/Font/model/store/unifiedFontStore.svelte.ts
+++ b/src/entities/Font/model/store/unifiedFontStore/unifiedFontStore.svelte.ts
@@ -13,10 +13,10 @@
  */
 
 import type { QueryObserverOptions } from '@tanstack/query-core';
-import type { ProxyFontsParams } from '../../api';
-import { fetchProxyFonts } from '../../api';
-import type { UnifiedFont } from '../types';
-import { BaseFontStore } from './baseFontStore.svelte';
+import type { ProxyFontsParams } from '../../../api';
+import { fetchProxyFonts } from '../../../api';
+import type { UnifiedFont } from '../../types';
+import { BaseFontStore } from '../baseFontStore/baseFontStore.svelte';
 
 /**
  * Unified font store wrapping TanStack Query with Svelte 5 runes