diff --git a/src/components/MigrationCard.tsx b/src/components/MigrationCard.tsx
index d5f7a92f..618f7919 100644
--- a/src/components/MigrationCard.tsx
+++ b/src/components/MigrationCard.tsx
@@ -17,7 +17,7 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { GetMigratableSourcesQuery } from '@/lib/graphql/generated/graphql.ts';
-import { translateExtensionLanguage } from '@/screens/util/Extensions.ts';
+import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 
 export type TMigratableSource = NonNullable<GetMigratableSourcesQuery['mangas']['nodes'][number]['source']> & {
diff --git a/src/modules/core/components/inputs/LangSelect.tsx b/src/modules/core/components/inputs/LangSelect.tsx
index d013e8c3..d466590f 100644
--- a/src/modules/core/components/inputs/LangSelect.tsx
+++ b/src/modules/core/components/inputs/LangSelect.tsx
@@ -21,7 +21,7 @@ import Tooltip from '@mui/material/Tooltip';
 import ListItem from '@mui/material/ListItem';
 import { useTranslation } from 'react-i18next';
 import { cloneObject } from '@/util/cloneObject.tsx';
-import { translateExtensionLanguage } from '@/screens/util/Extensions.ts';
+import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 
 function removeAll(firstList: any[], secondList: any[]) {
     secondList.forEach((item) => {
diff --git a/src/components/ExtensionCard.tsx b/src/modules/extension/components/ExtensionCard.tsx
similarity index 99%
rename from src/components/ExtensionCard.tsx
rename to src/modules/extension/components/ExtensionCard.tsx
index 8dc6d4ad..f29f0322 100644
--- a/src/components/ExtensionCard.tsx
+++ b/src/modules/extension/components/ExtensionCard.tsx
@@ -18,7 +18,7 @@ import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { makeToast } from '@/lib/ui/Toast.ts';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
-import { TExtension } from '@/screens/util/Extensions.ts';
+import { TExtension } from '@/modules/extension/services/Extensions.ts';
 import { TranslationKey } from '@/Base.types.ts';
 
 interface IProps {
diff --git a/src/screens/Extensions.tsx b/src/modules/extension/screens/Extensions.tsx
similarity index 98%
rename from src/screens/Extensions.tsx
rename to src/modules/extension/screens/Extensions.tsx
index 92413f1b..420e12de 100644
--- a/src/screens/Extensions.tsx
+++ b/src/modules/extension/screens/Extensions.tsx
@@ -27,12 +27,12 @@ import {
     isExtensionStateOrLanguage,
     TExtension,
     translateExtensionLanguage,
-} from '@/screens/util/Extensions';
+} from '@/modules/extension/services/Extensions.ts';
 import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { makeToast } from '@/lib/ui/Toast.ts';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';
-import { ExtensionCard } from '@/components/ExtensionCard';
+import { ExtensionCard } from '@/modules/extension/components/ExtensionCard.tsx';
 import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 import { StyledGroupedVirtuoso } from '@/modules/core/components/virtuoso/StyledGroupedVirtuoso.tsx';
 import { StyledGroupHeader } from '@/modules/core/components/virtuoso/StyledGroupHeader.tsx';
diff --git a/src/screens/util/Extensions.ts b/src/modules/extension/services/Extensions.ts
similarity index 100%
rename from src/screens/util/Extensions.ts
rename to src/modules/extension/services/Extensions.ts
diff --git a/src/modules/source/components/SourceCard.tsx b/src/modules/source/components/SourceCard.tsx
index 11df88e5..1ae7300f 100644
--- a/src/modules/source/components/SourceCard.tsx
+++ b/src/modules/source/components/SourceCard.tsx
@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import Stack from '@mui/material/Stack';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
-import { translateExtensionLanguage } from '@/screens/util/Extensions.ts';
+import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { SourceContentType } from '@/modules/source/screens/SourceMangas.tsx';
 import { SpinnerImage } from '@/modules/core/components/SpinnerImage.tsx';
 import { GetSourcesListQuery } from '@/lib/graphql/generated/graphql.ts';
diff --git a/src/modules/source/screens/Sources.tsx b/src/modules/source/screens/Sources.tsx
index aa3a143a..cdbedbcb 100644
--- a/src/modules/source/screens/Sources.tsx
+++ b/src/modules/source/screens/Sources.tsx
@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { sourceDefualtLangs, sourceForcedDefaultLangs, langSortCmp, DefaultLanguage } from '@/lib/Languages.tsx';
-import { translateExtensionLanguage } from '@/screens/util/Extensions.ts';
+import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { LoadingPlaceholder } from '@/modules/core/components/placeholder/LoadingPlaceholder.tsx';
 import { SourceCard } from '@/modules/source/components/SourceCard.tsx';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';
diff --git a/src/screens/Browse.tsx b/src/screens/Browse.tsx
index 71f88e4e..69b51cb8 100644
--- a/src/screens/Browse.tsx
+++ b/src/screens/Browse.tsx
@@ -11,7 +11,7 @@ import Tab from '@mui/material/Tab';
 import { useTranslation } from 'react-i18next';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { Sources } from '@/modules/source/screens/Sources.tsx';
-import { Extensions } from '@/screens/Extensions';
+import { Extensions } from '@/modules/extension/screens/Extensions.tsx';
 import { TabPanel } from '@/modules/core/components/tabs/TabPanel.tsx';
 import { TabsWrapper } from '@/modules/core/components/tabs/TabsWrapper.tsx';
 import { TabsMenu } from '@/modules/core/components/tabs/TabsMenu.tsx';
diff --git a/src/screens/SearchAll.tsx b/src/screens/SearchAll.tsx
index c0e872fe..6123f170 100644
--- a/src/screens/SearchAll.tsx
+++ b/src/screens/SearchAll.tsx
@@ -17,7 +17,7 @@ import Box from '@mui/material/Box';
 import { requestManager } from '@/lib/requests/requests/RequestManager.ts';
 import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
 import { langSortCmp, sourceDefualtLangs, sourceForcedDefaultLangs } from '@/lib/Languages.tsx';
-import { translateExtensionLanguage } from '@/screens/util/Extensions';
+import { translateExtensionLanguage } from '@/modules/extension/services/Extensions.ts';
 import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx';
 import { LangSelect } from '@/modules/core/components/inputs/LangSelect.tsx';
 import { useDebounce } from '@/modules/core/hooks/useDebounce.ts';