Rename folder "modules" to "features"

src/App.tsx

@@ -12,66 +12,69 @@ import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import { loadErrorMessages, loadDevMessages } from '@apollo/client/dev';
 import { loadable } from 'react-lazily/loadable';
 import Box from '@mui/material/Box';
-import { AppContext } from '@/modules/core/contexts/AppContext.tsx';
+import { AppContext } from '@/features/core/contexts/AppContext.tsx';
 import '@/i18n';
-import { DefaultNavBar } from '@/modules/navigation-bar/components/DefaultNavBar.tsx';
+import { DefaultNavBar } from '@/features/navigation-bar/components/DefaultNavBar.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { WebUIUpdateChecker } from '@/modules/app-updates/components/WebUIUpdateChecker.tsx';
-import { ServerUpdateChecker } from '@/modules/app-updates/components/ServerUpdateChecker.tsx';
-import { lazyLoadFallback } from '@/modules/core/utils/LazyLoad.tsx';
-import { ErrorBoundary } from '@/modules/core/components/feedback/ErrorBoundary.tsx';
-import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
+import { WebUIUpdateChecker } from '@/features/app-updates/components/WebUIUpdateChecker.tsx';
+import { ServerUpdateChecker } from '@/features/app-updates/components/ServerUpdateChecker.tsx';
+import { lazyLoadFallback } from '@/features/core/utils/LazyLoad.tsx';
+import { ErrorBoundary } from '@/features/core/components/feedback/ErrorBoundary.tsx';
+import { useNavBarContext } from '@/features/navigation-bar/contexts/NavbarContext.tsx';
 
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
 
-import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
-import { BrowseTab } from '@/modules/browse/Browse.types.ts';
+import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
+import { BrowseTab } from '@/features/browse/Browse.types.ts';
 
-const { Browse } = loadable(() => import('@/modules/browse/screens/Browse.tsx'), lazyLoadFallback);
-const { DownloadQueue } = loadable(() => import('@/modules/downloads/screens/DownloadQueue.tsx'), lazyLoadFallback);
-const { Library } = loadable(() => import('@/modules/library/screens/Library.tsx'), lazyLoadFallback);
-const { Manga } = loadable(() => import('@/modules/manga/screens/Manga.tsx'), lazyLoadFallback);
-const { SearchAll } = loadable(() => import('@/modules/global-search/screens/SearchAll.tsx'), lazyLoadFallback);
-const { Settings } = loadable(() => import('@/modules/settings/screens/Settings.tsx'), lazyLoadFallback);
-const { About } = loadable(() => import('@/modules/settings/screens/About.tsx'), lazyLoadFallback);
-const { Backup } = loadable(() => import('@/modules/backup/screens/Backup.tsx'), lazyLoadFallback);
+const { Browse } = loadable(() => import('@/features/browse/screens/Browse.tsx'), lazyLoadFallback);
+const { DownloadQueue } = loadable(() => import('@/features/downloads/screens/DownloadQueue.tsx'), lazyLoadFallback);
+const { Library } = loadable(() => import('@/features/library/screens/Library.tsx'), lazyLoadFallback);
+const { Manga } = loadable(() => import('@/features/manga/screens/Manga.tsx'), lazyLoadFallback);
+const { SearchAll } = loadable(() => import('@/features/global-search/screens/SearchAll.tsx'), lazyLoadFallback);
+const { Settings } = loadable(() => import('@/features/settings/screens/Settings.tsx'), lazyLoadFallback);
+const { About } = loadable(() => import('@/features/settings/screens/About.tsx'), lazyLoadFallback);
+const { Backup } = loadable(() => import('@/features/backup/screens/Backup.tsx'), lazyLoadFallback);
 const { CategorySettings } = loadable(
-    () => import('@/modules/category/screens/CategorySettings.tsx'),
+    () => import('@/features/category/screens/CategorySettings.tsx'),
     lazyLoadFallback,
 );
-const { SourceConfigure } = loadable(() => import('@/modules/source/screens/SourceConfigure.tsx'), lazyLoadFallback);
-const { SourceMangas } = loadable(() => import('@/modules/source/screens/SourceMangas.tsx'), lazyLoadFallback);
-const { ExtensionInfo } = loadable(() => import('@/modules/extension/screens/ExtensionInfo.tsx'), lazyLoadFallback);
-const { Updates } = loadable(() => import('@/modules/updates/screens/Updates.tsx'), lazyLoadFallback);
-const { History } = loadable(() => import('@/modules/history/screens/History.tsx'), lazyLoadFallback);
-const { LibrarySettings } = loadable(() => import('@/modules/library/screens/LibrarySettings.tsx'), lazyLoadFallback);
+const { SourceConfigure } = loadable(() => import('@/features/source/screens/SourceConfigure.tsx'), lazyLoadFallback);
+const { SourceMangas } = loadable(() => import('@/features/source/screens/SourceMangas.tsx'), lazyLoadFallback);
+const { ExtensionInfo } = loadable(() => import('@/features/extension/screens/ExtensionInfo.tsx'), lazyLoadFallback);
+const { Updates } = loadable(() => import('@/features/updates/screens/Updates.tsx'), lazyLoadFallback);
+const { History } = loadable(() => import('@/features/history/screens/History.tsx'), lazyLoadFallback);
+const { LibrarySettings } = loadable(() => import('@/features/library/screens/LibrarySettings.tsx'), lazyLoadFallback);
 const { DownloadSettings } = loadable(
-    () => import('@/modules/downloads/screens/DownloadSettings.tsx'),
+    () => import('@/features/downloads/screens/DownloadSettings.tsx'),
+    lazyLoadFallback,
+);
+const { ServerSettings } = loadable(() => import('@/features/settings/screens/ServerSettings.tsx'), lazyLoadFallback);
+const { BrowseSettings } = loadable(() => import('@/features/browse/screens/BrowseSettings.tsx'), lazyLoadFallback);
+const { WebUISettings } = loadable(() => import('@/features/settings/screens/WebUISettings.tsx'), lazyLoadFallback);
+const { Migrate } = loadable(() => import('@/features/migration/screens/Migrate.tsx'), lazyLoadFallback);
+const { DeviceSetting } = loadable(() => import('@/features/device/screens/DeviceSetting.tsx'), lazyLoadFallback);
+const { TrackingSettings } = loadable(
+    () => import('@/features/tracker/screens/TrackingSettings.tsx'),
     lazyLoadFallback,
 );
-const { ServerSettings } = loadable(() => import('@/modules/settings/screens/ServerSettings.tsx'), lazyLoadFallback);
-const { BrowseSettings } = loadable(() => import('@/modules/browse/screens/BrowseSettings.tsx'), lazyLoadFallback);
-const { WebUISettings } = loadable(() => import('@/modules/settings/screens/WebUISettings.tsx'), lazyLoadFallback);
-const { Migrate } = loadable(() => import('@/modules/migration/screens/Migrate.tsx'), lazyLoadFallback);
-const { DeviceSetting } = loadable(() => import('@/modules/device/screens/DeviceSetting.tsx'), lazyLoadFallback);
-const { TrackingSettings } = loadable(() => import('@/modules/tracker/screens/TrackingSettings.tsx'), lazyLoadFallback);
 const { TrackerOAuthLogin } = loadable(
-    () => import('@/modules/tracker/screens/TrackerOAuthLogin.tsx'),
+    () => import('@/features/tracker/screens/TrackerOAuthLogin.tsx'),
     lazyLoadFallback,
 );
 const { LibraryDuplicates } = loadable(
-    () => import('@/modules/library/screens/LibraryDuplicates.tsx'),
+    () => import('@/features/library/screens/LibraryDuplicates.tsx'),
     lazyLoadFallback,
 );
-const { Appearance } = loadable(() => import('@/modules/settings/screens/Appearance.tsx'), lazyLoadFallback);
+const { Appearance } = loadable(() => import('@/features/settings/screens/Appearance.tsx'), lazyLoadFallback);
 const { GlobalReaderSettings } = loadable(
-    () => import('@/modules/reader/screens/GlobalReaderSettings.tsx'),
+    () => import('@/features/reader/screens/GlobalReaderSettings.tsx'),
     lazyLoadFallback,
 );
-const { More } = loadable(() => import('@/modules/settings/screens/More.tsx'), lazyLoadFallback);
-const { Reader } = loadable(() => import('@/modules/reader/screens/Reader.tsx'), lazyLoadFallback);
-const { HistorySettings } = loadable(() => import('@/modules/history/screens/HistorySettings.tsx'), lazyLoadFallback);
+const { More } = loadable(() => import('@/features/settings/screens/More.tsx'), lazyLoadFallback);
+const { Reader } = loadable(() => import('@/features/reader/screens/Reader.tsx'), lazyLoadFallback);
+const { HistorySettings } = loadable(() => import('@/features/history/screens/HistorySettings.tsx'), lazyLoadFallback);
 
 if (process.env.NODE_ENV !== 'production') {
     // Adds messages only in a dev environment

src/features/app-updates/components/ServerUpdateChecker.tsx

@@ -15,11 +15,11 @@ import DialogContentText from '@mui/material/DialogContentText';
 import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { useUpdateChecker } from '@/modules/app-updates/hooks/useUpdateChecker.tsx';
-import { VersionUpdateInfoDialog } from '@/modules/app-updates/components/VersionUpdateInfoDialog.tsx';
-import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
+import { useUpdateChecker } from '@/features/app-updates/hooks/useUpdateChecker.tsx';
+import { VersionUpdateInfoDialog } from '@/features/app-updates/components/VersionUpdateInfoDialog.tsx';
+import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
+import { useLocalStorage } from '@/features/core/hooks/useStorage.tsx';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
 
 const disabledUpdateCheck = () => Promise.resolve();
 

src/features/app-updates/components/VersionUpdateInfoDialog.tsx

@@ -17,7 +17,7 @@ import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import { useTranslation } from 'react-i18next';
 import Stack from '@mui/material/Stack';
-import { useUpdateChecker } from '@/modules/app-updates/hooks/useUpdateChecker.tsx';
+import { useUpdateChecker } from '@/features/app-updates/hooks/useUpdateChecker.tsx';
 
 interface BaseProps {
     info: string;

src/features/app-updates/components/WebUIUpdateChecker.tsx

@@ -16,13 +16,13 @@ import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { UpdateState, WebUiChannel, WebUiUpdateStatus } from '@/lib/graphql/generated/graphql.ts';
-import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
+import { useLocalStorage } from '@/features/core/hooks/useStorage.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { ABOUT_WEBUI, WEBUI_UPDATE_CHECK } from '@/lib/graphql/fragments/InfoFragments.ts';
-import { VersionUpdateInfoDialog } from '@/modules/app-updates/components/VersionUpdateInfoDialog.tsx';
-import { useUpdateChecker } from '@/modules/app-updates/hooks/useUpdateChecker.tsx';
-import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
+import { VersionUpdateInfoDialog } from '@/features/app-updates/components/VersionUpdateInfoDialog.tsx';
+import { useUpdateChecker } from '@/features/app-updates/hooks/useUpdateChecker.tsx';
+import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 const disabledUpdateCheck = () => Promise.resolve();

src/features/app-updates/hooks/useUpdateChecker.tsx

@@ -8,7 +8,7 @@
 
 import { useCallback, useEffect, useMemo } from 'react';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx';
+import { useLocalStorage } from '@/features/core/hooks/useStorage.tsx';
 
 const UPDATE_CHECK_INTERVAL = 1000 * 60 * 60; // 1 hour
 const UPDATE_REMINDER_THRESHOLD = 1000 * 60 * 60; // 1 hour

src/features/backup/screens/Backup.tsx

@@ -25,20 +25,20 @@ import { Link } from 'react-router-dom';
 import Stack from '@mui/material/Stack';
 import { useEventListener, useMergedRef, useWindowEvent } from '@mantine/hooks';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { BackupRestoreState, ValidateBackupQuery } from '@/lib/graphql/generated/graphql.ts';
-import { Progress } from '@/modules/core/components/feedback/Progress.tsx';
-import { TextSetting } from '@/modules/core/components/settings/text/TextSetting.tsx';
-import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
-import { TimeSetting } from '@/modules/core/components/settings/TimeSetting.tsx';
-import { LoadingPlaceholder } from '@/modules/core/components/feedback/LoadingPlaceholder.tsx';
-import { EmptyViewAbsoluteCentered } from '@/modules/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
+import { Progress } from '@/features/core/components/feedback/Progress.tsx';
+import { TextSetting } from '@/features/core/components/settings/text/TextSetting.tsx';
+import { NumberSetting } from '@/features/core/components/settings/NumberSetting.tsx';
+import { TimeSetting } from '@/features/core/components/settings/TimeSetting.tsx';
+import { LoadingPlaceholder } from '@/features/core/components/feedback/LoadingPlaceholder.tsx';
+import { EmptyViewAbsoluteCentered } from '@/features/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { ServerSettings } from '@/modules/settings/Settings.types.ts';
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
+import { ServerSettings } from '@/features/settings/Settings.types.ts';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
-import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
-import { BrowseTab } from '@/modules/browse/Browse.types.ts';
+import { useAppTitle } from '@/features/navigation-bar/hooks/useAppTitle.ts';
+import { BrowseTab } from '@/features/browse/Browse.types.ts';
 
 type BackupSettingsType = Pick<ServerSettings, 'backupPath' | 'backupTime' | 'backupInterval' | 'backupTTL'>;
 

src/features/browse/Browse.types.ts

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { SourceIdInfo } from '@/modules/source/Source.types.ts';
+import { SourceIdInfo } from '@/features/source/Source.types.ts';
 
 export type MetadataBrowseSettings = {
     hideLibraryEntries: boolean;

src/features/browse/screens/Browse.tsx

@@ -10,17 +10,17 @@ import { useCallback, useRef, useState } from 'react';
 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 '@/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';
-import { Migration } from '@/modules/migration/screens/Migration.tsx';
-import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
-import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
-import { BrowseTab } from '@/modules/browse/Browse.types.ts';
+import { Sources } from '@/features/source/screens/Sources.tsx';
+import { Extensions } from '@/features/extension/screens/Extensions.tsx';
+import { TabPanel } from '@/features/core/components/tabs/TabPanel.tsx';
+import { TabsWrapper } from '@/features/core/components/tabs/TabsWrapper.tsx';
+import { TabsMenu } from '@/features/core/components/tabs/TabsMenu.tsx';
+import { Migration } from '@/features/migration/screens/Migration.tsx';
+import { useResizeObserver } from '@/features/core/hooks/useResizeObserver.tsx';
+import { useAppTitle } from '@/features/navigation-bar/hooks/useAppTitle.ts';
+import { BrowseTab } from '@/features/browse/Browse.types.ts';
 import { GROUPED_VIRTUOSO_Z_INDEX } from '@/lib/virtuoso/Virtuoso.constants.ts';
-import { SearchParam } from '@/modules/core/Core.types.ts';
+import { SearchParam } from '@/features/core/Core.types.ts';
 
 export function Browse() {
     const { t } = useTranslation();

src/features/browse/screens/BrowseSettings.tsx

@@ -12,21 +12,21 @@ import ListItem from '@mui/material/ListItem';
 import ListItemText from '@mui/material/ListItemText';
 import Switch from '@mui/material/Switch';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { NumberSetting } from '@/modules/core/components/settings/NumberSetting.tsx';
-import { MutableListSetting } from '@/modules/core/components/settings/MutableListSetting.tsx';
-import { TextSetting } from '@/modules/core/components/settings/text/TextSetting.tsx';
+import { NumberSetting } from '@/features/core/components/settings/NumberSetting.tsx';
+import { MutableListSetting } from '@/features/core/components/settings/MutableListSetting.tsx';
+import { TextSetting } from '@/features/core/components/settings/text/TextSetting.tsx';
 import {
     createUpdateMetadataServerSettings,
     useMetadataServerSettings,
-} from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { LoadingPlaceholder } from '@/modules/core/components/feedback/LoadingPlaceholder.tsx';
-import { EmptyViewAbsoluteCentered } from '@/modules/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
+} from '@/features/settings/services/ServerSettingsMetadata.ts';
+import { LoadingPlaceholder } from '@/features/core/components/feedback/LoadingPlaceholder.tsx';
+import { EmptyViewAbsoluteCentered } from '@/features/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
-import { MetadataBrowseSettings } from '@/modules/browse/Browse.types.ts';
-import { ServerSettings as GqlServerSettings } from '@/modules/settings/Settings.types.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
+import { MetadataBrowseSettings } from '@/features/browse/Browse.types.ts';
+import { ServerSettings as GqlServerSettings } from '@/features/settings/Settings.types.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
-import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
+import { useAppTitle } from '@/features/navigation-bar/hooks/useAppTitle.ts';
 
 type ExtensionsSettings = Pick<GqlServerSettings, 'maxSourcesInParallel' | 'localSourcePath' | 'extensionRepos'>;
 

src/features/category/Category.types.ts

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { LibraryOptions } from '@/modules/library/Library.types.ts';
+import { LibraryOptions } from '@/features/library/Library.types.ts';
 import { CategoryMetaType, CategoryType } from '@/lib/graphql/generated/graphql.ts';
 
 export interface ICategoryMetadata extends LibraryOptions {}

src/features/category/components/CategoriesInclusionSetting.tsx

@@ -17,17 +17,17 @@ import DialogContentText from '@mui/material/DialogContentText';
 import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
 import { t as translate } from 'i18next';
-import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { ThreeStateCheckboxInput } from '@/features/core/components/inputs/ThreeStateCheckboxInput.tsx';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { IncludeOrExclude } from '@/lib/graphql/generated/graphql.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { CheckboxContainer } from '@/modules/core/components/inputs/CheckboxContainer.ts';
+import { CheckboxContainer } from '@/features/core/components/inputs/CheckboxContainer.ts';
 import {
     CategoryDownloadInclusionInfo,
     CategoryIdInfo,
     CategoryNameInfo,
     CategoryUpdateInclusionInfo,
-} from '@/modules/category/Category.types.ts';
+} from '@/features/category/Category.types.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 type CategoryType = CategoryIdInfo & CategoryNameInfo & CategoryUpdateInclusionInfo & CategoryDownloadInclusionInfo;

src/features/category/components/CategorySelect.tsx

@@ -17,14 +17,14 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import Stack from '@mui/material/Stack';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { Mangas } from '@/modules/manga/services/Mangas.ts';
-import { useSelectableCollection } from '@/modules/collection/hooks/useSelectableCollection.ts';
-import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
-import { Categories } from '@/modules/category/services/Categories.ts';
-import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { Mangas } from '@/features/manga/services/Mangas.ts';
+import { useSelectableCollection } from '@/features/collection/hooks/useSelectableCollection.ts';
+import { ThreeStateCheckboxInput } from '@/features/core/components/inputs/ThreeStateCheckboxInput.tsx';
+import { Categories } from '@/features/category/services/Categories.ts';
+import { CheckboxInput } from '@/features/core/components/inputs/CheckboxInput.tsx';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { updateMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
+import { updateMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
 import {
     GetCategoriesBaseQuery,
     GetCategoriesBaseQueryVariables,
@@ -33,7 +33,7 @@ import {
 } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CATEGORIES_BASE } from '@/lib/graphql/queries/CategoryQuery.ts';
 import { GET_MANGA_CATEGORIES } from '@/lib/graphql/queries/MangaQuery.ts';
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 type BaseProps = {

src/features/category/components/CategorySettingsCard.tsx

@@ -15,10 +15,10 @@ import Box from '@mui/material/Box';
 import Card from '@mui/material/Card';
 import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { CategoryType } from '@/lib/graphql/generated/graphql.ts';
-import { ListCardContent } from '@/modules/core/components/lists/cards/ListCardContent.tsx';
+import { ListCardContent } from '@/features/core/components/lists/cards/ListCardContent.tsx';
 
 export const CategorySettingsCard = ({
     category,

src/features/category/components/CreateOrEditCategoryDialog.tsx

@@ -17,9 +17,9 @@ import Checkbox from '@mui/material/Checkbox';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { CategoryDefaultInfo, CategoryIdInfo, CategoryNameInfo } from '@/modules/category/Category.types.ts';
+import { CategoryDefaultInfo, CategoryIdInfo, CategoryNameInfo } from '@/features/category/Category.types.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { assertIsDefined } from '@/Asserts.ts';
 
 export const CreateOrEditCategoryDialog = ({

src/features/category/hooks/useCategorySelect.tsx

@@ -7,7 +7,7 @@
  */
 
 import { useMemo, useState } from 'react';
-import { CategorySelect, CategorySelectProps } from '@/modules/category/components/CategorySelect.tsx';
+import { CategorySelect, CategorySelectProps } from '@/features/category/components/CategorySelect.tsx';
 
 export const useCategorySelect = ({
     mangaId,

src/features/category/screens/CategorySettings.tsx

@@ -14,21 +14,21 @@ import Box from '@mui/material/Box';
 import { closestCenter, DndContext, DragEndEvent } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { DEFAULT_FULL_FAB_HEIGHT } from '@/modules/core/components/buttons/StyledFab.tsx';
-import { LoadingPlaceholder } from '@/modules/core/components/feedback/LoadingPlaceholder.tsx';
-import { EmptyViewAbsoluteCentered } from '@/modules/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
+import { DEFAULT_FULL_FAB_HEIGHT } from '@/features/core/components/buttons/StyledFab.tsx';
+import { LoadingPlaceholder } from '@/features/core/components/feedback/LoadingPlaceholder.tsx';
+import { EmptyViewAbsoluteCentered } from '@/features/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { GetCategoriesSettingsQuery, GetCategoriesSettingsQueryVariables } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CATEGORIES_SETTINGS } from '@/lib/graphql/queries/CategoryQuery.ts';
-import { CategorySettingsCard } from '@/modules/category/components/CategorySettingsCard.tsx';
-import { CategoryIdInfo } from '@/modules/category/Category.types.ts';
+import { CategorySettingsCard } from '@/features/category/components/CategorySettingsCard.tsx';
+import { CategoryIdInfo } from '@/features/category/Category.types.ts';
 import { getErrorMessage, noOp } from '@/lib/HelperFunctions.ts';
 import { DndSortableItem } from '@/lib/dnd-kit/DndSortableItem.tsx';
 import { DndKitUtil } from '@/lib/dnd-kit/DndKitUtil.ts';
 import { DndOverlayItem } from '@/lib/dnd-kit/DndOverlayItem.tsx';
-import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
-import { CREATE_NEW_CATEGORY_ID } from '@/modules/category/Category.constants.ts';
-import { CreateOrEditCategoryDialog } from '@/modules/category/components/CreateOrEditCategoryDialog.tsx';
+import { useAppTitle } from '@/features/navigation-bar/hooks/useAppTitle.ts';
+import { CREATE_NEW_CATEGORY_ID } from '@/features/category/Category.constants.ts';
+import { CreateOrEditCategoryDialog } from '@/features/category/components/CreateOrEditCategoryDialog.tsx';
 
 export function CategorySettings() {
     const { t } = useTranslation();

src/features/category/services/Categories.ts

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { CategoryDefaultInfo, CategoryIdInfo } from '@/modules/category/Category.types.ts';
+import { CategoryDefaultInfo, CategoryIdInfo } from '@/features/category/Category.types.ts';
 
 export const DEFAULT_CATEGORY_ID = 0;
 

src/features/category/services/CategoryMetadata.ts

@@ -7,18 +7,18 @@
  */
 
 import { useEffect, useMemo } from 'react';
-import { requestUpdateCategoryMetadata } from '@/modules/metadata/services/MetadataUpdater.ts';
+import { requestUpdateCategoryMetadata } from '@/features/metadata/services/MetadataUpdater.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { LibraryOptions } from '@/modules/library/Library.types.ts';
-import { CategoryIdInfo, CategoryMetadataKeys, ICategoryMetadata } from '@/modules/category/Category.types.ts';
-import { convertFromGqlMeta } from '@/modules/metadata/services/MetadataConverter.ts';
-import { getMetadataFrom } from '@/modules/metadata/services/MetadataReader.ts';
+import { LibraryOptions } from '@/features/library/Library.types.ts';
+import { CategoryIdInfo, CategoryMetadataKeys, ICategoryMetadata } from '@/features/category/Category.types.ts';
+import { convertFromGqlMeta } from '@/features/metadata/services/MetadataConverter.ts';
+import { getMetadataFrom } from '@/features/metadata/services/MetadataReader.ts';
 import {
     AllowedMetadataValueTypes,
     GqlMetaHolder,
     Metadata,
     MetadataHolder,
-} from '@/modules/metadata/Metadata.types.ts';
+} from '@/features/metadata/Metadata.types.ts';
 
 export const DEFAULT_CATEGORY_METADATA: ICategoryMetadata = {
     // sort options

src/features/chapter/Chapter.constants.ts

@@ -7,7 +7,7 @@
  */
 
 import { TranslationKey } from '@/Base.types.ts';
-import { ChapterAction, ChapterListOptions, ChapterSortMode } from '@/modules/chapter/Chapter.types.ts';
+import { ChapterAction, ChapterListOptions, ChapterSortMode } from '@/features/chapter/Chapter.types.ts';
 
 export const FALLBACK_CHAPTER = { id: -1, name: '', realUrl: '', isBookmarked: false };
 

src/features/chapter/components/ChapterExcludeSanlatorsFilter.tsx

@@ -10,9 +10,9 @@ import { bindTrigger, usePopupState } from 'material-ui-popup-state/hooks';
 import { useTranslation } from 'react-i18next';
 import PeopleAltOutlinedIcon from '@mui/icons-material/PeopleAltOutlined';
 import DisabledByDefaultRounded from '@mui/icons-material/DisabledByDefaultRounded';
-import { CheckboxListSetting } from '@/modules/core/components/settings/CheckboxListSetting.tsx';
-import { updateChapterListOptions } from '@/modules/chapter/utils/ChapterList.util.tsx';
-import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
+import { CheckboxListSetting } from '@/features/core/components/settings/CheckboxListSetting.tsx';
+import { updateChapterListOptions } from '@/features/chapter/utils/ChapterList.util.tsx';
+import { CheckboxInput } from '@/features/core/components/inputs/CheckboxInput.tsx';
 
 export const ChapterExcludeSanlatorsFilter = ({
     updateOption,

src/features/chapter/components/ChapterList.tsx

@@ -13,36 +13,36 @@ import Typography from '@mui/material/Typography';
 import { ComponentProps, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { ResumeFab } from '@/modules/manga/components/ResumeFAB.tsx';
+import { ResumeFab } from '@/features/manga/components/ResumeFAB.tsx';
 import {
     filterAndSortChapters,
     updateChapterListOptions,
     useChapterListOptions,
-} from '@/modules/chapter/utils/ChapterList.util.tsx';
-import { EmptyViewAbsoluteCentered } from '@/modules/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
-import { ChaptersToolbarMenu } from '@/modules/chapter/components/ChaptersToolbarMenu.tsx';
-import { SelectionFAB } from '@/modules/collection/components/SelectionFAB.tsx';
-import { DEFAULT_FULL_FAB_HEIGHT } from '@/modules/core/components/buttons/StyledFab.tsx';
+} from '@/features/chapter/utils/ChapterList.util.tsx';
+import { EmptyViewAbsoluteCentered } from '@/features/core/components/feedback/EmptyViewAbsoluteCentered.tsx';
+import { ChaptersToolbarMenu } from '@/features/chapter/components/ChaptersToolbarMenu.tsx';
+import { SelectionFAB } from '@/features/collection/components/SelectionFAB.tsx';
+import { DEFAULT_FULL_FAB_HEIGHT } from '@/features/core/components/buttons/StyledFab.tsx';
 import {
     ChapterListFieldsFragment,
     GetChaptersMangaQuery,
     GetChaptersMangaQueryVariables,
     MangaScreenFieldsFragment,
 } from '@/lib/graphql/generated/graphql.ts';
-import { useSelectableCollection } from '@/modules/collection/hooks/useSelectableCollection.ts';
-import { SelectableCollectionSelectAll } from '@/modules/collection/components/SelectableCollectionSelectAll.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { ChapterActionMenuItems } from '@/modules/chapter/components/actions/ChapterActionMenuItems.tsx';
+import { useSelectableCollection } from '@/features/collection/hooks/useSelectableCollection.ts';
+import { SelectableCollectionSelectAll } from '@/features/collection/components/SelectableCollectionSelectAll.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
+import { ChapterActionMenuItems } from '@/features/chapter/components/actions/ChapterActionMenuItems.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { LoadingPlaceholder } from '@/modules/core/components/feedback/LoadingPlaceholder.tsx';
+import { LoadingPlaceholder } from '@/features/core/components/feedback/LoadingPlaceholder.tsx';
 import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
-import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
-import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
-import { shouldForwardProp } from '@/modules/core/utils/ShouldForwardProp.ts';
+import { useNavBarContext } from '@/features/navigation-bar/contexts/NavbarContext.tsx';
+import { useResizeObserver } from '@/features/core/hooks/useResizeObserver.tsx';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
+import { shouldForwardProp } from '@/features/core/utils/ShouldForwardProp.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
-import { ChapterListCard } from '@/modules/chapter/components/cards/ChapterListCard.tsx';
+import { makeToast } from '@/features/core/utils/Toast.ts';
+import { ChapterListCard } from '@/features/chapter/components/cards/ChapterListCard.tsx';
 import { VirtuosoPersisted } from '@/lib/virtuoso/Component/VirtuosoPersisted.tsx';
 
 type ChapterListHeaderProps = {

src/features/chapter/components/ChapterOptions.tsx

@@ -9,15 +9,15 @@
 import RadioGroup from '@mui/material/RadioGroup';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { RadioInput } from '@/modules/core/components/inputs/RadioInput.tsx';
-import { SortRadioInput } from '@/modules/core/components/inputs/SortRadioInput.tsx';
-import { ThreeStateCheckboxInput } from '@/modules/core/components/inputs/ThreeStateCheckboxInput.tsx';
-import { OptionsTabs } from '@/modules/core/components/modals/OptionsTabs.tsx';
-import { CHAPTER_SORT_OPTIONS_TO_TRANSLATION_KEY } from '@/modules/chapter/Chapter.constants.ts';
+import { RadioInput } from '@/features/core/components/inputs/RadioInput.tsx';
+import { SortRadioInput } from '@/features/core/components/inputs/SortRadioInput.tsx';
+import { ThreeStateCheckboxInput } from '@/features/core/components/inputs/ThreeStateCheckboxInput.tsx';
+import { OptionsTabs } from '@/features/core/components/modals/OptionsTabs.tsx';
+import { CHAPTER_SORT_OPTIONS_TO_TRANSLATION_KEY } from '@/features/chapter/Chapter.constants.ts';
 import { TranslationKey } from '@/Base.types.ts';
-import { ChapterListOptions } from '@/modules/chapter/Chapter.types.ts';
-import { updateChapterListOptions } from '@/modules/chapter/utils/ChapterList.util.tsx';
-import { ChapterExcludeSanlatorsFilter } from '@/modules/chapter/components/ChapterExcludeSanlatorsFilter.tsx';
+import { ChapterListOptions } from '@/features/chapter/Chapter.types.ts';
+import { updateChapterListOptions } from '@/features/chapter/utils/ChapterList.util.tsx';
+import { ChapterExcludeSanlatorsFilter } from '@/features/chapter/components/ChapterExcludeSanlatorsFilter.tsx';
 
 interface IProps {
     open: boolean;

src/features/chapter/components/ChaptersToolbarMenu.tsx

@@ -15,18 +15,18 @@ import Menu from '@mui/material/Menu';
 import DownloadIcon from '@mui/icons-material/Download';
 import DoneAllIcon from '@mui/icons-material/DoneAll';
 import { useMemo } from 'react';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { ChapterOptions } from '@/modules/chapter/components/ChapterOptions.tsx';
-import { isFilterActive, updateChapterListOptions } from '@/modules/chapter/utils/ChapterList.util.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { ChapterOptions } from '@/features/chapter/components/ChapterOptions.tsx';
+import { isFilterActive, updateChapterListOptions } from '@/features/chapter/utils/ChapterList.util.tsx';
 import {
     ChapterBookmarkInfo,
     ChapterDownloadInfo,
     ChapterIdInfo,
     ChapterListOptions,
     ChapterReadInfo,
-} from '@/modules/chapter/Chapter.types.ts';
-import { ChaptersDownloadActionMenuItems } from '@/modules/chapter/components/actions/ChaptersDownloadActionMenuItems.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
+} from '@/features/chapter/Chapter.types.ts';
+import { ChaptersDownloadActionMenuItems } from '@/features/chapter/components/actions/ChaptersDownloadActionMenuItems.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
 
 interface IProps {
     mangaId: number;

src/features/chapter/components/actions/ChapterActionMenuItems.tsx

@@ -16,21 +16,21 @@ import BookmarkRemove from '@mui/icons-material/BookmarkRemove';
 import BookmarkAdd from '@mui/icons-material/BookmarkAdd';
 import DoneAll from '@mui/icons-material/DoneAll';
 import { ComponentProps, useMemo } from 'react';
-import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { MenuItem } from '@/modules/core/components/menu/MenuItem.tsx';
+import { SelectableCollectionReturnType } from '@/features/collection/hooks/useSelectableCollection.ts';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
+import { MenuItem } from '@/features/core/components/menu/MenuItem.tsx';
 import {
     createGetMenuItemTitle,
     createIsMenuItemDisabled,
     createShouldShowMenuItem,
-} from '@/modules/core/components/menu/Menu.utils.ts';
+} from '@/features/core/components/menu/Menu.utils.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { ChapterCard } from '@/modules/chapter/components/cards/ChapterCard.tsx';
+import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
+import { ChapterCard } from '@/features/chapter/components/cards/ChapterCard.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { GetChaptersMangaQuery } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
-import { CHAPTER_ACTION_TO_TRANSLATION } from '@/modules/chapter/Chapter.constants.ts';
+import { CHAPTER_ACTION_TO_TRANSLATION } from '@/features/chapter/Chapter.constants.ts';
 import {
     ChapterAction,
     ChapterBookmarkInfo,
@@ -39,7 +39,7 @@ import {
     ChapterMangaInfo,
     ChapterReadInfo,
     ChapterRealUrlInfo,
-} from '@/modules/chapter/Chapter.types.ts';
+} from '@/features/chapter/Chapter.types.ts';
 import { IconWebView } from '@/assets/icons/IconWebView.tsx';
 import { IconBrowser } from '@/assets/icons/IconBrowser.tsx';
 

src/features/chapter/components/actions/ChaptersDownloadActionMenuItems.tsx

@@ -9,8 +9,8 @@
 import MenuItem from '@mui/material/MenuItem';
 import { useTranslation } from 'react-i18next';
 import gql from 'graphql-tag';
-import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
-import { Mangas } from '@/modules/manga/services/Mangas.ts';
+import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
+import { Mangas } from '@/features/manga/services/Mangas.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import {
     ChapterOrderBy,
@@ -21,13 +21,13 @@ import {
 } from '@/lib/graphql/generated/graphql.ts';
 import { TranslationKey } from '@/Base.types.ts';
 import { MANGA_META_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts';
-import { getMangaMetadata } from '@/modules/manga/services/MangaMetadata.ts';
+import { getMangaMetadata } from '@/features/manga/services/MangaMetadata.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
-import { filterChapters } from '@/modules/chapter/utils/ChapterList.util.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
-import { CHAPTER_ACTION_TO_TRANSLATION } from '@/modules/chapter/Chapter.constants.ts';
+import { filterChapters } from '@/features/chapter/utils/ChapterList.util.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
+import { CHAPTER_ACTION_TO_TRANSLATION } from '@/features/chapter/Chapter.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 const DOWNLOAD_OPTIONS: {

src/features/chapter/components/buttons/ChapterDownloadButton.tsx

@@ -9,13 +9,13 @@
 import IconButton from '@mui/material/IconButton';
 import { useTranslation } from 'react-i18next';
 import DownloadIcon from '@mui/icons-material/Download';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { MUIUtil } from '@/lib/mui/MUI.util.ts';
-import { ChapterIdInfo } from '@/modules/chapter/Chapter.types.ts';
+import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts';
 
 export const ChapterDownloadButton = ({
     chapterId,

src/features/chapter/components/buttons/ChapterDownloadRetryButton.tsx

@@ -10,13 +10,13 @@ import Refresh from '@mui/icons-material/Refresh';
 import IconButton from '@mui/material/IconButton';
 import { useTranslation } from 'react-i18next';
 import { DownloadState } from '@/lib/graphql/generated/graphql.ts';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { MUIUtil } from '@/lib/mui/MUI.util.ts';
-import { ChapterIdInfo } from '@/modules/chapter/Chapter.types.ts';
+import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts';
 
 export const ChapterDownloadRetryButton = ({ chapterId }: { chapterId: ChapterIdInfo['id'] }) => {
     const { t } = useTranslation();

src/features/chapter/components/cards/ChapterCard.tsx

@@ -19,17 +19,17 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import PopupState, { bindMenu, bindTrigger } from 'material-ui-popup-state';
 import { useLongPress } from 'use-long-press';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 import { getDateString } from '@/util/DateHelper.ts';
-import { DownloadStateIndicator } from '@/modules/core/components/downloads/DownloadStateIndicator.tsx';
+import { DownloadStateIndicator } from '@/features/core/components/downloads/DownloadStateIndicator.tsx';
 import { ChapterType } from '@/lib/graphql/generated/graphql.ts';
-import { ChapterActionMenuItems } from '@/modules/chapter/components/actions/ChapterActionMenuItems.tsx';
-import { Menu } from '@/modules/core/components/menu/Menu.tsx';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
-import { ChapterCardMetadata } from '@/modules/chapter/components/cards/ChapterCardMetadata.tsx';
+import { ChapterActionMenuItems } from '@/features/chapter/components/actions/ChapterActionMenuItems.tsx';
+import { Menu } from '@/features/core/components/menu/Menu.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
+import { applyStyles } from '@/features/core/utils/ApplyStyles.ts';
+import { ChapterCardMetadata } from '@/features/chapter/components/cards/ChapterCardMetadata.tsx';
 import { MUIUtil } from '@/lib/mui/MUI.util.ts';
-import { ListCardContent } from '@/modules/core/components/lists/cards/ListCardContent.tsx';
+import { ListCardContent } from '@/features/core/components/lists/cards/ListCardContent.tsx';
 import {
     ChapterBookmarkInfo,
     ChapterDownloadInfo,
@@ -38,8 +38,8 @@ import {
     ChapterNumberInfo,
     ChapterReadInfo,
     ChapterScanlatorInfo,
-} from '@/modules/chapter/Chapter.types.ts';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
+} from '@/features/chapter/Chapter.types.ts';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
 
 type TChapter = ChapterIdInfo &
     ChapterMangaInfo &

src/features/chapter/components/cards/ChapterCardMetadata.tsx

@@ -9,8 +9,8 @@
 import Box from '@mui/material/Box';
 import { ComponentProps, ReactNode } from 'react';
 import Stack from '@mui/material/Stack';
-import { TypographyMaxLines } from '@/modules/core/components/texts/TypographyMaxLines.tsx';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { TypographyMaxLines } from '@/features/core/components/texts/TypographyMaxLines.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 
 export const ChapterCardMetadata = ({
     title,

src/features/chapter/components/cards/ChapterCardThumbnail.tsx

@@ -7,11 +7,11 @@
  */
 
 import { Link } from 'react-router-dom';
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
-import { Mangas } from '@/modules/manga/services/Mangas.ts';
-import { MangaIdInfo, MangaThumbnailInfo } from '@/modules/manga/Manga.types.ts';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
+import { Mangas } from '@/features/manga/services/Mangas.ts';
+import { MangaIdInfo, MangaThumbnailInfo } from '@/features/manga/Manga.types.ts';
 import { MangaType } from '@/lib/graphql/generated/graphql.ts';
-import { ListCardAvatar } from '@/modules/core/components/lists/cards/ListCardAvatar.tsx';
+import { ListCardAvatar } from '@/features/core/components/lists/cards/ListCardAvatar.tsx';
 
 export const ChapterCardThumbnail = ({
     mangaId,

src/features/chapter/components/cards/ChapterListCard.tsx

@@ -8,11 +8,11 @@
 
 import Stack from '@mui/material/Stack';
 import { ComponentProps } from 'react';
-import { ChapterCard } from '@/modules/chapter/components/cards/ChapterCard.tsx';
+import { ChapterCard } from '@/features/chapter/components/cards/ChapterCard.tsx';
 
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
-import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
-import { MissingChaptersInfoSeparator } from '@/modules/chapter/components/MissingChaptersInfoSeparator.tsx';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
+import { applyStyles } from '@/features/core/utils/ApplyStyles.ts';
+import { MissingChaptersInfoSeparator } from '@/features/chapter/components/MissingChaptersInfoSeparator.tsx';
 
 type ChapterCardProps = ComponentProps<typeof ChapterCard>;
 

src/features/chapter/services/Chapters.ts

@@ -8,9 +8,9 @@
 
 import { t as translate } from 'i18next';
 import { DocumentNode, MaybeMasked, Unmasked, useFragment } from '@apollo/client';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { getMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
+import { getMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
 import {
     ChapterListFieldsFragment,
     ChapterType,
@@ -20,16 +20,16 @@ import {
 import { CHAPTER_LIST_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
 
 import { DirectionOffset } from '@/Base.types.ts';
-import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
-import { ReaderOpenChapterLocationState, ReaderResumeMode } from '@/modules/reader/types/Reader.types.ts';
-import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
+import { MangaIdInfo } from '@/features/manga/Manga.types.ts';
+import { ReaderOpenChapterLocationState, ReaderResumeMode } from '@/features/reader/types/Reader.types.ts';
+import { AppRoutes } from '@/features/core/AppRoute.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { DOWNLOAD_TYPE_FIELDS } from '@/lib/graphql/fragments/DownloadFragments.ts';
 import { epochToDate, getDateString } from '@/util/DateHelper.ts';
 import {
     CHAPTER_ACTION_TO_CONFIRMATION_REQUIRED,
     CHAPTER_ACTION_TO_TRANSLATION,
-} from '@/modules/chapter/Chapter.constants.ts';
+} from '@/features/chapter/Chapter.constants.ts';
 import {
     ChapterAction,
     ChapterBookmarkInfo,
@@ -40,9 +40,9 @@ import {
     ChapterReadInfo,
     ChapterScanlatorInfo,
     ChapterSourceOrderInfo,
-} from '@/modules/chapter/Chapter.types.ts';
+} from '@/features/chapter/Chapter.types.ts';
 import { assertIsDefined } from '@/Asserts.ts';
-import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx';
+import { awaitConfirmation } from '@/features/core/utils/AwaitableDialog.tsx';
 
 export class Chapters {
     static getIds(chapters: { id: number }[]): number[] {

src/features/chapter/utils/ChapterList.util.tsx

@@ -15,10 +15,10 @@ import {
     ChapterListOptions,
     ChapterReadInfo,
     ChapterScanlatorInfo,
-} from '@/modules/chapter/Chapter.types.ts';
-import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
-import { GqlMetaHolder } from '@/modules/metadata/Metadata.types.ts';
-import { createUpdateMangaMetadata, useGetMangaMetadata } from '@/modules/manga/services/MangaMetadata.ts';
+} from '@/features/chapter/Chapter.types.ts';
+import { MangaIdInfo } from '@/features/manga/Manga.types.ts';
+import { GqlMetaHolder } from '@/features/metadata/Metadata.types.ts';
+import { createUpdateMangaMetadata, useGetMangaMetadata } from '@/features/manga/services/MangaMetadata.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 
 export function unreadFilter(unread: NullAndUndefined<boolean>, { isRead: isChapterRead }: ChapterReadInfo) {

src/features/collection/components/SelectableCollectionSelectAll.tsx

@@ -8,7 +8,7 @@
 
 import Checkbox from '@mui/material/Checkbox';
 import { useTranslation } from 'react-i18next';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 
 export const SelectableCollectionSelectAll = ({
     areAllItemsSelected,

src/features/collection/components/SelectableCollectionSelectMode.tsx

@@ -9,8 +9,8 @@
 import Checkbox from '@mui/material/Checkbox';
 import { useTranslation } from 'react-i18next';
 import ClearIcon from '@mui/icons-material/Clear';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { SelectableCollectionSelectAll } from '@/modules/collection/components/SelectableCollectionSelectAll.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { SelectableCollectionSelectAll } from '@/features/collection/components/SelectableCollectionSelectAll.tsx';
 
 export const SelectableCollectionSelectMode = ({
     isActive,

src/features/collection/components/SelectionFAB.tsx

@@ -13,8 +13,8 @@ import { styled } from '@mui/material/styles';
 import React, { type JSX } from 'react';
 import { useTranslation } from 'react-i18next';
 import PopupState, { bindMenu, bindTrigger } from 'material-ui-popup-state';
-import { DEFAULT_FAB_STYLE } from '@/modules/core/components/buttons/StyledFab.tsx';
-import { Menu } from '@/modules/core/components/menu/Menu.tsx';
+import { DEFAULT_FAB_STYLE } from '@/features/core/components/buttons/StyledFab.tsx';
+import { Menu } from '@/features/core/components/menu/Menu.tsx';
 import { TranslationKey } from '@/Base.types.ts';
 
 interface SelectionFABProps {

src/features/core/AppRoute.constants.ts

@@ -7,11 +7,11 @@
  */
 
 import { SourceType } from '@/lib/graphql/generated/graphql.ts';
-import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
+import { MangaIdInfo } from '@/features/manga/Manga.types.ts';
 
-import { ChapterSourceOrderInfo } from '@/modules/chapter/Chapter.types.ts';
-import { BrowseTab } from '@/modules/browse/Browse.types.ts';
-import { SearchParam } from '@/modules/core/Core.types.ts';
+import { ChapterSourceOrderInfo } from '@/features/chapter/Chapter.types.ts';
+import { BrowseTab } from '@/features/browse/Browse.types.ts';
+import { SearchParam } from '@/features/core/Core.types.ts';
 
 type AppRouteInfo = {
     match: string;

src/features/core/components/AppbarSearch.tsx

@@ -14,9 +14,9 @@ import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { useTheme } from '@mui/material/styles';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { SearchTextField } from '@/modules/core/components/inputs/SearchTextField.tsx';
-import { SearchParam } from '@/modules/core/Core.types.ts';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { SearchTextField } from '@/features/core/components/inputs/SearchTextField.tsx';
+import { SearchParam } from '@/features/core/Core.types.ts';
 
 interface IProps {
     isClosable?: boolean;

src/features/core/components/GridLayouts.tsx

@@ -14,9 +14,9 @@ import Radio from '@mui/material/Radio';
 import React from 'react';
 import ViewModuleIcon from '@mui/icons-material/ViewModule';
 import { useTranslation } from 'react-i18next';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 
-import { GridLayout } from '@/modules/core/Core.types.ts';
+import { GridLayout } from '@/features/core/Core.types.ts';
 
 // TODO: clean up this to use a FormControl, and remove dependency on name o radio button
 export function GridLayouts({

src/features/core/components/SpinnerImage.tsx

@@ -18,8 +18,8 @@ import ImageIcon from '@mui/icons-material/Image';
 import { SxProps, Theme } from '@mui/material/styles';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { Priority } from '@/lib/Queue.ts';
-import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
-import { useIntersectionObserver } from '@/modules/core/hooks/useIntersectionObserver.tsx';
+import { applyStyles } from '@/features/core/utils/ApplyStyles.ts';
+import { useIntersectionObserver } from '@/features/core/hooks/useIntersectionObserver.tsx';
 
 export interface SpinnerImageProps {
     shouldLoad?: boolean;

src/features/core/components/UpdateChecker.tsx

@@ -15,15 +15,15 @@ import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import ClearIcon from '@mui/icons-material/Clear';
 import Stack from '@mui/material/Stack';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
-import { Progress } from '@/modules/core/components/feedback/Progress.tsx';
+import { makeToast } from '@/features/core/utils/Toast.ts';
+import { Progress } from '@/features/core/components/feedback/Progress.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { dateTimeFormatter } from '@/util/DateHelper.ts';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
 
-import { CategoryIdInfo } from '@/modules/category/Category.types.ts';
+import { CategoryIdInfo } from '@/features/category/Category.types.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 let lastRunningState = false;

src/features/core/components/buttons/ButtonSelect.tsx

@@ -9,9 +9,9 @@
 import Stack from '@mui/material/Stack';
 import { useTranslation } from 'react-i18next';
 import Button from '@mui/material/Button';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { MultiValueButtonProps } from '@/modules/core/Core.types.ts';
-import { Superscript } from '@/modules/core/components/texts/Superscript.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { MultiValueButtonProps } from '@/features/core/Core.types.ts';
+import { Superscript } from '@/features/core/components/texts/Superscript.tsx';
 
 export const ButtonSelect = <Value extends string | number>({
     value,

src/features/core/components/buttons/ResetButton.tsx

@@ -10,7 +10,7 @@ import Button, { ButtonProps } from '@mui/material/Button';
 import { useTranslation } from 'react-i18next';
 import RestartAltIcon from '@mui/icons-material/RestartAlt';
 import IconButton, { IconButtonProps } from '@mui/material/IconButton';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
 
 type PropsIconButton = { asIconButton: true } & IconButtonProps;
 type PropsButton = { asIconButton?: false } & ButtonProps;

src/features/core/components/buttons/ValueRotationButton.tsx

@@ -9,10 +9,10 @@
 import { useTranslation } from 'react-i18next';
 import { ReactNode, useMemo } from 'react';
 import Button from '@mui/material/Button';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { MultiValueButtonProps } from '@/modules/core/Core.types.ts';
-import { getNextRotationValue } from '@/modules/core/utils/ValueRotationButton.utils.ts';
-import { Superscript } from '@/modules/core/components/texts/Superscript.tsx';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { MultiValueButtonProps } from '@/features/core/Core.types.ts';
+import { getNextRotationValue } from '@/features/core/utils/ValueRotationButton.utils.ts';
+import { Superscript } from '@/features/core/components/texts/Superscript.tsx';
 
 export const ValueRotationButton = <Value extends string | number>({
     tooltip,

src/features/core/components/downloads/DownloadStateIndicator.tsx

@@ -11,9 +11,9 @@ import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
 import { useTranslation } from 'react-i18next';
 import { DownloadState } from '@/lib/graphql/generated/graphql.ts';
-import { Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { Chapters } from '@/features/chapter/services/Chapters.ts';
 import { TranslationKey } from '@/Base.types.ts';
-import { ChapterIdInfo } from '@/modules/chapter/Chapter.types.ts';
+import { ChapterIdInfo } from '@/features/chapter/Chapter.types.ts';
 
 const DOWNLOAD_STATE_TO_TRANSLATION_KEY_MAP: { [state in DownloadState]: TranslationKey } = {
     DOWNLOADING: 'download.state.label.downloading',

src/features/core/components/feedback/EmptyViewAbsoluteCentered.tsx

@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { EmptyView, EmptyViewProps } from '@/modules/core/components/feedback/EmptyView.tsx';
+import { EmptyView, EmptyViewProps } from '@/features/core/components/feedback/EmptyView.tsx';
 
 export function EmptyViewAbsoluteCentered({ sx, ...emptyViewProps }: EmptyViewProps) {
     return (

src/features/core/components/feedback/ErrorBoundary.tsx

@@ -10,7 +10,7 @@ import { Component, ErrorInfo, ReactNode, useEffect, useRef, useState } from 're
 import { useLocation } from 'react-router-dom';
 import { t } from 'i18next';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
-import { EmptyView } from '@/modules/core/components/feedback/EmptyView.tsx';
+import { EmptyView } from '@/features/core/components/feedback/EmptyView.tsx';
 
 interface Props {
     children?: ReactNode;

src/features/core/components/feedback/SnackbarWithDescription.tsx

@@ -13,10 +13,10 @@ import AlertTitle from '@mui/material/AlertTitle';
 import Button from '@mui/material/Button';
 import { useTranslation } from 'react-i18next';
 import { useTheme } from '@mui/material/styles';
-import { awaitConfirmation } from '@/modules/core/utils/AwaitableDialog.tsx';
+import { awaitConfirmation } from '@/features/core/utils/AwaitableDialog.tsx';
 import { TranslationKey } from '@/Base.types.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
 import { extractGraphqlExceptionInfo } from '@/lib/HelperFunctions.ts';
 
 const MAX_DESCRIPTION_LENGTH = 200;

src/features/core/components/inputs/ButtonSelectInput.tsx

@@ -10,7 +10,7 @@ import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import { ComponentProps } from 'react';
 
-import { ButtonSelect } from '@/modules/core/components/buttons/ButtonSelect.tsx';
+import { ButtonSelect } from '@/features/core/components/buttons/ButtonSelect.tsx';
 
 export const ButtonSelectInput = <Value extends string | number>({
     label,

src/features/core/components/inputs/LanguageSelect.tsx

@@ -19,9 +19,9 @@ import ListItemText from '@mui/material/ListItemText';
 import ListItem from '@mui/material/ListItem';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { translateExtensionLanguage } from '@/modules/extension/Extensions.utils.ts';
-import { languageSortComparator, toUniqueLanguageCodes } from '@/modules/core/utils/Languages.ts';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { translateExtensionLanguage } from '@/features/extension/Extensions.utils.ts';
+import { languageSortComparator, toUniqueLanguageCodes } from '@/features/core/utils/Languages.ts';
 
 interface IProps {
     selectedLanguages: string[];

src/features/core/components/inputs/SliderInput.tsx

@@ -9,7 +9,7 @@
 import Slider, { SliderProps } from '@mui/material/Slider';
 import Typography, { TypographyProps } from '@mui/material/Typography';
 import Stack from '@mui/material/Stack';
-import { ResetButton } from '@/modules/core/components/buttons/ResetButton.tsx';
+import { ResetButton } from '@/features/core/components/buttons/ResetButton.tsx';
 
 export const SliderInput = ({
     label,

src/features/core/components/inputs/SortRadioInput.tsx

@@ -9,7 +9,7 @@
 import ArrowDownward from '@mui/icons-material/ArrowDownward';
 import ArrowUpward from '@mui/icons-material/ArrowUpward';
 import { memo } from 'react';
-import { RadioInput, RadioInputProps } from '@/modules/core/components/inputs/RadioInput.tsx';
+import { RadioInput, RadioInputProps } from '@/features/core/components/inputs/RadioInput.tsx';
 
 interface IProps extends RadioInputProps {
     sortDescending?: boolean | null | undefined;

src/features/core/components/inputs/ThreeStateCheckboxInput.tsx

@@ -8,7 +8,7 @@
 
 import FormControlLabel from '@mui/material/FormControlLabel';
 import React from 'react';
-import { ThreeStateCheckbox, ThreeStateCheckboxProps } from '@/modules/core/components/inputs/ThreeStateCheckbox.tsx';
+import { ThreeStateCheckbox, ThreeStateCheckboxProps } from '@/features/core/components/inputs/ThreeStateCheckbox.tsx';
 
 interface IProps extends ThreeStateCheckboxProps {
     label?: string;

src/features/core/components/lists/cards/ListCardAvatar.tsx

@@ -7,7 +7,7 @@
  */
 
 import Avatar, { AvatarProps } from '@mui/material/Avatar';
-import { SpinnerImage, SpinnerImageProps } from '@/modules/core/components/SpinnerImage.tsx';
+import { SpinnerImage, SpinnerImageProps } from '@/features/core/components/SpinnerImage.tsx';
 
 export const ListCardAvatar = ({
     iconUrl,

src/features/core/components/menu/NestedMenuItem.tsx

@@ -33,9 +33,9 @@ import Box from '@mui/material/Box';
 import { OverridableComponent } from '@mui/material/OverridableComponent';
 import { SvgIconTypeMap } from '@mui/material/SvgIcon';
 import { useMergedRef } from '@mantine/hooks';
-import { IconMenuItem } from '@/modules/core/components/menu/IconMenuItem.tsx';
-import { getOptionForDirection } from '@/modules/theme/services/ThemeCreator.ts';
-import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
+import { IconMenuItem } from '@/features/core/components/menu/IconMenuItem.tsx';
+import { getOptionForDirection } from '@/features/theme/services/ThemeCreator.ts';
+import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
 
 export type NestedMenuItemProps = Omit<MuiMenuItemProps, 'button'> & {
     parentMenuOpen: boolean;

src/features/core/components/modals/OptionsTabs.tsx

@@ -10,8 +10,8 @@ import Stack from '@mui/material/Stack';
 import Tab from '@mui/material/Tab';
 import Tabs from '@mui/material/Tabs';
 import React, { useState } from 'react';
-import { TabPanel } from '@/modules/core/components/tabs/TabPanel.tsx';
-import { OptionsPanel } from '@/modules/core/components/modals/OptionsPanel.tsx';
+import { TabPanel } from '@/features/core/components/tabs/TabPanel.tsx';
+import { OptionsPanel } from '@/features/core/components/modals/OptionsPanel.tsx';
 
 interface IProps<T = string> {
     open: boolean;

src/features/core/components/settings/CheckboxListSetting.tsx

@@ -16,8 +16,8 @@ import { useTranslation } from 'react-i18next';
 import Stack from '@mui/material/Stack';
 import { useCallback, useMemo } from 'react';
 import { CheckboxProps } from '@mui/material/Checkbox';
-import { CheckboxInput } from '@/modules/core/components/inputs/CheckboxInput.tsx';
-import { useSelectableCollection } from '@/modules/collection/hooks/useSelectableCollection.ts';
+import { CheckboxInput } from '@/features/core/components/inputs/CheckboxInput.tsx';
+import { useSelectableCollection } from '@/features/collection/hooks/useSelectableCollection.ts';
 
 export function CheckboxListSetting<Item>({
     title,

src/features/core/components/settings/MutableListSetting.tsx

@@ -23,10 +23,10 @@ import DeleteIcon from '@mui/icons-material/Delete';
 import IconButton from '@mui/material/IconButton';
 import DialogContentText from '@mui/material/DialogContentText';
 import InfoIcon from '@mui/icons-material/Info';
-import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { TextSetting, TextSettingProps } from '@/modules/core/components/settings/text/TextSetting.tsx';
-import { TextSettingDialog } from '@/modules/core/components/settings/text/TextSettingDialog.tsx';
-import { makeToast } from '@/modules/core/utils/Toast.ts';
+import { CustomTooltip } from '@/features/core/components/CustomTooltip.tsx';
+import { TextSetting, TextSettingProps } from '@/features/core/components/settings/text/TextSetting.tsx';
+import { TextSettingDialog } from '@/features/core/components/settings/text/TextSettingDialog.tsx';
+import { makeToast } from '@/features/core/utils/Toast.ts';
 
 const MutableListItem = ({
     handleDelete,

src/features/core/components/settings/SelectSetting.tsx

@@ -21,7 +21,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import DialogContentText from '@mui/material/DialogContentText';
 import InfoIcon from '@mui/icons-material/Info';
-import { Select } from '@/modules/core/components/inputs/Select.tsx';
+import { Select } from '@/features/core/components/inputs/Select.tsx';
 import { TranslationKey } from '@/Base.types.ts';
 
 export type SelectSettingValueDisplayInfo = {

src/features/core/components/settings/text/TextSetting.tsx

@@ -12,7 +12,7 @@ import { useState } from 'react';
 import {
     TextSettingDialog,
     TextSettingDialogProps,
-} from '@/modules/core/components/settings/text/TextSettingDialog.tsx';
+} from '@/features/core/components/settings/text/TextSettingDialog.tsx';
 
 export type TextSettingProps = Omit<TextSettingDialogProps, 'isDialogOpen' | 'setIsDialogOpen' | 'value'> &
     Required<Pick<TextSettingDialogProps, 'value'>> & {

src/features/core/components/settings/text/TextSettingDialog.tsx

@@ -15,7 +15,7 @@ import TextField from '@mui/material/TextField';
 import DialogActions from '@mui/material/DialogActions';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PasswordTextField } from '@/modules/core/components/inputs/PasswordTextField.tsx';
+import { PasswordTextField } from '@/features/core/components/inputs/PasswordTextField.tsx';
 
 export type TextSettingDialogProps = {
     settingName: string;

src/features/core/components/tabs/TabsMenu.tsx

@@ -9,7 +9,7 @@
 import Tabs, { TabsProps } from '@mui/material/Tabs';
 import { styled } from '@mui/material/styles';
 import { ForwardedRef, forwardRef } from 'react';
-import { useNavBarContext } from '@/modules/navigation-bar/contexts/NavbarContext.tsx';
+import { useNavBarContext } from '@/features/navigation-bar/contexts/NavbarContext.tsx';
 
 const StyledTabsMenu = styled(Tabs)(({ theme }) => ({
     display: 'flex',