kibis-is · kieranroneill · Dec 24, 2023 · Dec 24, 2023 · Dec 24, 2023 · Dec 24, 2023
diff --git a/src/extension/apps/background/Root.tsx b/src/extension/apps/background/Root.tsx
@@ -2,10 +2,7 @@ import React, { FC, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 
 // components
-import EnableModal from '@extension/components/EnableModal';
 import LoadingPage from '@extension/components/LoadingPage';
-import SignTxnsModal from '@extension/components/SignTxnsModal';
-import SignBytesModal from '@extension/components/SignBytesModal';
 
 // features
 import { fetchAccountsFromStorageThunk } from '@extension/features/accounts';
@@ -19,6 +16,11 @@ import { fetchSessionsThunk } from '@extension/features/sessions';
 import { fetchSettings } from '@extension/features/settings';
 import { closeCurrentWindowThunk } from '@extension/features/system';
 
+// modals
+import EnableModal from '@extension/modals/EnableModal';
+import SignTxnsModal from '@extension/modals/SignTxnsModal';
+import SignBytesModal from '@extension/modals/SignBytesModal';
+
 // selectors
 import { useSelectSelectedNetwork } from '@extension/selectors';
 

diff --git a/src/extension/apps/main/App.tsx b/src/extension/apps/main/App.tsx
@@ -32,10 +32,10 @@ import {
   setSideBar,
 } from '@extension/features/system';
 
-// pages
-import AccountRouter from '@extension/pages/AccountRouter';
-import AddAccountRouter from '@extension/pages/MainAddAccountRouter';
-import SettingsRouter from '@extension/pages/SettingsRouter';
+// routers
+import AccountRouter from '@extension/routers/AccountRouter';
+import AddAccountRouter from '@extension/routers/MainAddAccountRouter';
+import SettingsRouter from '@extension/routers/SettingsRouter';
 
 // types
 import { IAppProps, IAppThunkDispatch, IMainRootState } from '@extension/types';

diff --git a/src/extension/apps/main/Root.tsx b/src/extension/apps/main/Root.tsx
@@ -3,15 +3,7 @@ import { useDispatch } from 'react-redux';
 import { NavigateFunction, Outlet, useNavigate } from 'react-router-dom';
 
 // components
-import AddAssetModal from '@extension/components/AddAssetModal';
-import ConfirmModal from '@extension/components/ConfirmModal';
-import EnableModal from '@extension/components/EnableModal';
-import ErrorModal from '@extension/components/ErrorModal';
 import MainLayout from '@extension/components/MainLayout';
-import SendAssetModal from '@extension/components/SendAssetModal';
-import SignBytesModal from '@extension/components/SignBytesModal';
-import SignTxnsModal from '@extension/components/SignTxnsModal';
-import WalletConnectModal from '@extension/components/WalletConnectModal';
 
 // features
 import { reset as resetAddAsset } from '@extension/features/add-asset';
@@ -45,6 +37,16 @@ import useOnNetworkConnectivity from '@extension/hooks/useOnNetworkConnectivity'
 import useOnNewAssets from '@extension/hooks/useOnNewAssets';
 import useNotifications from '@extension/hooks/useNotifications';
 
+// modals
+import AddAssetModal from '@extension/modals/AddAssetModal';
+import ConfirmModal from '@extension/modals/ConfirmModal';
+import EnableModal from '@extension/modals/EnableModal';
+import ErrorModal from '@extension/modals/ErrorModal';
+import SendAssetModal from '@extension/modals/SendAssetModal';
+import SignBytesModal from '@extension/modals/SignBytesModal';
+import SignTxnsModal from '@extension/modals/SignTxnsModal';
+import WalletConnectModal from '@extension/modals/WalletConnectModal';
+
 // selectors
 import {
   useSelectAccounts,

diff --git a/src/extension/apps/registration/App.tsx b/src/extension/apps/registration/App.tsx
@@ -24,7 +24,9 @@ import { reducer as systemReducer } from '@extension/features/system';
 // pages
 import CreatePasswordPage from '@extension/pages/CreatePasswordPage';
 import GetStartedPage from '@extension/pages/GetStartedPage';
-import RegistrationAddAccountRouter from '@extension/pages/RegistrationAddAccountRouter';
+
+// routers
+import RegistrationAddAccountRouter from '@extension/routers/RegistrationAddAccountRouter';
 
 // types
 import { IAppProps, IRegistrationRootState } from '@extension/types';

diff --git a/src/extension/apps/registration/Root.tsx b/src/extension/apps/registration/Root.tsx
@@ -3,13 +3,13 @@ import React, { FC, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { NavigateFunction, Outlet, useNavigate } from 'react-router-dom';
 
-// components
-import ErrorModal from '@extension/components/ErrorModal';
-
 // features
 import { setError, setNavigate } from '@extension/features/system';
 import { fetchSettings } from '@extension/features/settings';
 
+// modals
+import ErrorModal from '@extension/modals//ErrorModal';
+
 // types
 import { IAppThunkDispatch } from '@extension/types';
 

diff --git a/src/extension/components/CreatePasswordInput/CreatePasswordInput.tsx b/src/extension/components/CreatePasswordInput/CreatePasswordInput.tsx
@@ -14,7 +14,6 @@ import { Trans, useTranslation } from 'react-i18next';
 import { IoEye, IoEyeOff } from 'react-icons/io5';
 
 // components
-import DocumentModal from '@extension/components/DocumentModal';
 import IconButton from '@extension/components/IconButton';
 import StrengthMeter from '@extension/components/StrengthMeter';
 
@@ -24,6 +23,9 @@ import usePrimaryColor from '@extension/hooks/usePrimaryColor';
 import usePrimaryColorScheme from '@extension/hooks/usePrimaryColorScheme';
 import useSubTextColor from '@extension/hooks/useSubTextColor';
 
+// modals
+import DocumentModal from '@extension/modals//DocumentModal';
+
 // utils
 import { validate } from './utils';
 

diff --git a/...AddAssetModal/AddAssetArc200AssetItem.tsx → ...AddAssetModal/AddAssetArc200AssetItem.tsx b/...AddAssetModal/AddAssetArc200AssetItem.tsx → ...AddAssetModal/AddAssetArc200AssetItem.tsx
diff --git a/...omponents/AddAssetModal/AddAssetModal.tsx → ...on/modals/AddAssetModal/AddAssetModal.tsx b/...omponents/AddAssetModal/AddAssetModal.tsx → ...on/modals/AddAssetModal/AddAssetModal.tsx
diff --git a/...dal/AddAssetModalArc200SummaryContent.tsx → ...dal/AddAssetModalArc200SummaryContent.tsx b/...dal/AddAssetModalArc200SummaryContent.tsx → ...dal/AddAssetModalArc200SummaryContent.tsx
diff --git a/...dAssetModal/AddAssetStandardAssetItem.tsx → ...dAssetModal/AddAssetStandardAssetItem.tsx b/...dAssetModal/AddAssetStandardAssetItem.tsx → ...dAssetModal/AddAssetStandardAssetItem.tsx
diff --git a/...tension/components/AddAssetModal/index.ts → src/extension/modals/AddAssetModal/index.ts b/...tension/components/AddAssetModal/index.ts → src/extension/modals/AddAssetModal/index.ts
diff --git a/.../components/ConfirmModal/ConfirmModal.tsx → ...sion/modals/ConfirmModal/ConfirmModal.tsx b/.../components/ConfirmModal/ConfirmModal.tsx → ...sion/modals/ConfirmModal/ConfirmModal.tsx
diff --git a/...xtension/components/ConfirmModal/index.ts → src/extension/modals/ConfirmModal/index.ts b/...xtension/components/ConfirmModal/index.ts → src/extension/modals/ConfirmModal/index.ts
diff --git a/...irmPasswordModal/ConfirmPasswordModal.tsx → ...irmPasswordModal/ConfirmPasswordModal.tsx b/...irmPasswordModal/ConfirmPasswordModal.tsx → ...irmPasswordModal/ConfirmPasswordModal.tsx
diff --git a/.../components/ConfirmPasswordModal/index.ts → ...sion/modals/ConfirmPasswordModal/index.ts b/.../components/ConfirmPasswordModal/index.ts → ...sion/modals/ConfirmPasswordModal/index.ts
diff --git a/...omponents/DocumentModal/DocumentModal.tsx → ...on/modals/DocumentModal/DocumentModal.tsx b/...omponents/DocumentModal/DocumentModal.tsx → ...on/modals/DocumentModal/DocumentModal.tsx
diff --git a/.../DocumentModal/hooks/useDocument/index.ts → .../DocumentModal/hooks/useDocument/index.ts b/.../DocumentModal/hooks/useDocument/index.ts → .../DocumentModal/hooks/useDocument/index.ts
diff --git a/...odal/hooks/useDocument/types/IDocument.ts → ...odal/hooks/useDocument/types/IDocument.ts b/...odal/hooks/useDocument/types/IDocument.ts → ...odal/hooks/useDocument/types/IDocument.ts
diff --git a/...ks/useDocument/types/IUseDocumentState.ts → ...ks/useDocument/types/IUseDocumentState.ts b/...ks/useDocument/types/IUseDocumentState.ts → ...ks/useDocument/types/IUseDocumentState.ts
diff --git a/...entModal/hooks/useDocument/types/index.ts → ...entModal/hooks/useDocument/types/index.ts b/...entModal/hooks/useDocument/types/index.ts → ...entModal/hooks/useDocument/types/index.ts
diff --git a/...entModal/hooks/useDocument/useDocument.ts → ...entModal/hooks/useDocument/useDocument.ts b/...entModal/hooks/useDocument/useDocument.ts → ...entModal/hooks/useDocument/useDocument.ts
diff --git a/...tension/components/DocumentModal/index.ts → src/extension/modals/DocumentModal/index.ts b/...tension/components/DocumentModal/index.ts → src/extension/modals/DocumentModal/index.ts
diff --git a/.../DocumentModal/utils/createComponents.tsx → .../DocumentModal/utils/createComponents.tsx b/.../DocumentModal/utils/createComponents.tsx → .../DocumentModal/utils/createComponents.tsx
diff --git a/...n/components/DocumentModal/utils/index.ts → ...nsion/modals/DocumentModal/utils/index.ts b/...n/components/DocumentModal/utils/index.ts → ...nsion/modals/DocumentModal/utils/index.ts
diff --git a/...on/components/EnableModal/EnableModal.tsx → ...ension/modals/EnableModal/EnableModal.tsx b/...on/components/EnableModal/EnableModal.tsx → ...ension/modals/EnableModal/EnableModal.tsx
diff --git a/...extension/components/EnableModal/index.ts → src/extension/modals/EnableModal/index.ts b/...extension/components/EnableModal/index.ts → src/extension/modals/EnableModal/index.ts
diff --git a/...sion/components/ErrorModal/ErrorModal.tsx → ...xtension/modals/ErrorModal/ErrorModal.tsx b/...sion/components/ErrorModal/ErrorModal.tsx → ...xtension/modals/ErrorModal/ErrorModal.tsx
diff --git a/src/extension/components/ErrorModal/index.ts → src/extension/modals/ErrorModal/index.ts b/src/extension/components/ErrorModal/index.ts → src/extension/modals/ErrorModal/index.ts
diff --git a/...ManageSessionModal/ManageSessionModal.tsx → ...ManageSessionModal/ManageSessionModal.tsx b/...ManageSessionModal/ManageSessionModal.tsx → ...ManageSessionModal/ManageSessionModal.tsx
diff --git a/...on/components/ManageSessionModal/index.ts → ...ension/modals/ManageSessionModal/index.ts b/...on/components/ManageSessionModal/index.ts → ...ension/modals/ManageSessionModal/index.ts
diff --git a/...onents/SendAssetModal/SendAmountInput.tsx → ...modals/SendAssetModal/SendAmountInput.tsx b/...onents/SendAssetModal/SendAmountInput.tsx → ...modals/SendAssetModal/SendAmountInput.tsx
diff --git a/...ponents/SendAssetModal/SendAssetModal.tsx → .../modals/SendAssetModal/SendAssetModal.tsx b/...ponents/SendAssetModal/SendAssetModal.tsx → .../modals/SendAssetModal/SendAssetModal.tsx
diff --git a/...etModal/SendAssetModalContentSkeleton.tsx → ...etModal/SendAssetModalContentSkeleton.tsx b/...etModal/SendAssetModalContentSkeleton.tsx → ...etModal/SendAssetModalContentSkeleton.tsx
diff --git a/...setModal/SendAssetModalSummaryContent.tsx → ...setModal/SendAssetModalSummaryContent.tsx b/...setModal/SendAssetModalSummaryContent.tsx → ...setModal/SendAssetModalSummaryContent.tsx
diff --git a/...s/SendAssetModal/SendAssetSummaryItem.tsx → ...s/SendAssetModal/SendAssetSummaryItem.tsx b/...s/SendAssetModal/SendAssetSummaryItem.tsx → ...s/SendAssetModal/SendAssetSummaryItem.tsx
diff --git a/...ension/components/SendAssetModal/index.ts → src/extension/modals/SendAssetModal/index.ts b/...ension/components/SendAssetModal/index.ts → src/extension/modals/SendAssetModal/index.ts
diff --git a/...s/ShareAddressModal/ShareAddressModal.tsx → ...s/ShareAddressModal/ShareAddressModal.tsx b/...s/ShareAddressModal/ShareAddressModal.tsx → ...s/ShareAddressModal/ShareAddressModal.tsx
diff --git a/...ion/components/ShareAddressModal/index.ts → ...tension/modals/ShareAddressModal/index.ts b/...ion/components/ShareAddressModal/index.ts → ...tension/modals/ShareAddressModal/index.ts
diff --git a/...ts/SignBytesModal/SignBytesJwtContent.tsx → ...ls/SignBytesModal/SignBytesJwtContent.tsx b/...ts/SignBytesModal/SignBytesJwtContent.tsx → ...ls/SignBytesModal/SignBytesJwtContent.tsx
diff --git a/...ponents/SignBytesModal/SignBytesModal.tsx → .../modals/SignBytesModal/SignBytesModal.tsx b/...ponents/SignBytesModal/SignBytesModal.tsx → .../modals/SignBytesModal/SignBytesModal.tsx
diff --git a/...ension/components/SignBytesModal/index.ts → src/extension/modals/SignBytesModal/index.ts b/...ension/components/SignBytesModal/index.ts → src/extension/modals/SignBytesModal/index.ts
diff --git a/...nsModal/ApplicationTransactionContent.tsx → ...nsModal/ApplicationTransactionContent.tsx b/...nsModal/ApplicationTransactionContent.tsx → ...nsModal/ApplicationTransactionContent.tsx
diff --git a/...nsModal/AssetConfigTransactionContent.tsx → ...nsModal/AssetConfigTransactionContent.tsx b/...nsModal/AssetConfigTransactionContent.tsx → ...nsModal/AssetConfigTransactionContent.tsx
diff --git a/...nsModal/AssetCreateTransactionContent.tsx → ...nsModal/AssetCreateTransactionContent.tsx b/...nsModal/AssetCreateTransactionContent.tsx → ...nsModal/AssetCreateTransactionContent.tsx
diff --git a/...nsModal/AssetFreezeTransactionContent.tsx → ...nsModal/AssetFreezeTransactionContent.tsx b/...nsModal/AssetFreezeTransactionContent.tsx → ...nsModal/AssetFreezeTransactionContent.tsx
diff --git a/...Modal/AssetTransferTransactionContent.tsx → ...Modal/AssetTransferTransactionContent.tsx b/...Modal/AssetTransferTransactionContent.tsx → ...Modal/AssetTransferTransactionContent.tsx
diff --git a/...dal/KeyRegistrationTransactionContent.tsx → ...dal/KeyRegistrationTransactionContent.tsx b/...dal/KeyRegistrationTransactionContent.tsx → ...dal/KeyRegistrationTransactionContent.tsx
diff --git a/...TxnsModal/MultipleTransactionsContent.tsx → ...TxnsModal/MultipleTransactionsContent.tsx b/...TxnsModal/MultipleTransactionsContent.tsx → ...TxnsModal/MultipleTransactionsContent.tsx
diff --git a/...gnTxnsModal/PaymentTransactionContent.tsx → ...gnTxnsModal/PaymentTransactionContent.tsx b/...gnTxnsModal/PaymentTransactionContent.tsx → ...gnTxnsModal/PaymentTransactionContent.tsx
diff --git a/...nts/SignTxnsModal/SignTxnsAddressItem.tsx → ...als/SignTxnsModal/SignTxnsAddressItem.tsx b/...nts/SignTxnsModal/SignTxnsAddressItem.tsx → ...als/SignTxnsModal/SignTxnsAddressItem.tsx
diff --git a/...nents/SignTxnsModal/SignTxnsAssetItem.tsx → ...odals/SignTxnsModal/SignTxnsAssetItem.tsx b/...nents/SignTxnsModal/SignTxnsAssetItem.tsx → ...odals/SignTxnsModal/SignTxnsAssetItem.tsx
diff --git a/...gnTxnsModal/SignTxnsChangeAddressItem.tsx → ...gnTxnsModal/SignTxnsChangeAddressItem.tsx b/...gnTxnsModal/SignTxnsChangeAddressItem.tsx → ...gnTxnsModal/SignTxnsChangeAddressItem.tsx
diff --git a/...nts/SignTxnsModal/SignTxnsLoadingItem.tsx → ...als/SignTxnsModal/SignTxnsLoadingItem.tsx b/...nts/SignTxnsModal/SignTxnsLoadingItem.tsx → ...als/SignTxnsModal/SignTxnsLoadingItem.tsx
diff --git a/...omponents/SignTxnsModal/SignTxnsModal.tsx → ...on/modals/SignTxnsModal/SignTxnsModal.tsx b/...omponents/SignTxnsModal/SignTxnsModal.tsx → ...on/modals/SignTxnsModal/SignTxnsModal.tsx
diff --git a/...ts/SignTxnsModal/SignTxnsModalContent.tsx → ...ls/SignTxnsModal/SignTxnsModalContent.tsx b/...ts/SignTxnsModal/SignTxnsModalContent.tsx → ...ls/SignTxnsModal/SignTxnsModalContent.tsx
diff --git a/...onents/SignTxnsModal/SignTxnsTextItem.tsx → ...modals/SignTxnsModal/SignTxnsTextItem.tsx b/...onents/SignTxnsModal/SignTxnsTextItem.tsx → ...modals/SignTxnsModal/SignTxnsTextItem.tsx
diff --git a/...tension/components/SignTxnsModal/index.ts → src/extension/modals/SignTxnsModal/index.ts b/...tension/components/SignTxnsModal/index.ts → src/extension/modals/SignTxnsModal/index.ts
diff --git a/...ts/SignTxnsModal/types/ICondensedProps.ts → ...ls/SignTxnsModal/types/ICondensedProps.ts b/...ts/SignTxnsModal/types/ICondensedProps.ts → ...ls/SignTxnsModal/types/ICondensedProps.ts
diff --git a/...n/components/SignTxnsModal/types/index.ts → ...nsion/modals/SignTxnsModal/types/index.ts b/...n/components/SignTxnsModal/types/index.ts → ...nsion/modals/SignTxnsModal/types/index.ts
diff --git a/...WalletConnectModal/WalletConnectModal.tsx → ...WalletConnectModal/WalletConnectModal.tsx b/...WalletConnectModal/WalletConnectModal.tsx → ...WalletConnectModal/WalletConnectModal.tsx
diff --git a/...nectModal/hooks/useCaptureQrCode/index.ts → ...nectModal/hooks/useCaptureQrCode/index.ts b/...nectModal/hooks/useCaptureQrCode/index.ts → ...nectModal/hooks/useCaptureQrCode/index.ts
diff --git a/...ureQrCode/types/IUseCaptureQrCodeState.ts → ...ureQrCode/types/IUseCaptureQrCodeState.ts b/...ureQrCode/types/IUseCaptureQrCodeState.ts → ...ureQrCode/types/IUseCaptureQrCodeState.ts
diff --git a/...dal/hooks/useCaptureQrCode/types/index.ts → ...dal/hooks/useCaptureQrCode/types/index.ts b/...dal/hooks/useCaptureQrCode/types/index.ts → ...dal/hooks/useCaptureQrCode/types/index.ts
diff --git a/...ooks/useCaptureQrCode/useCaptureQrCode.ts → ...ooks/useCaptureQrCode/useCaptureQrCode.ts b/...ooks/useCaptureQrCode/useCaptureQrCode.ts → ...ooks/useCaptureQrCode/useCaptureQrCode.ts
diff --git a/...s/useCaptureQrCode/utils/captureQrCode.ts → ...s/useCaptureQrCode/utils/captureQrCode.ts b/...s/useCaptureQrCode/utils/captureQrCode.ts → ...s/useCaptureQrCode/utils/captureQrCode.ts
diff --git a/...dal/hooks/useCaptureQrCode/utils/index.ts → ...dal/hooks/useCaptureQrCode/utils/index.ts b/...dal/hooks/useCaptureQrCode/utils/index.ts → ...dal/hooks/useCaptureQrCode/utils/index.ts
diff --git a/...on/components/WalletConnectModal/index.ts → ...ension/modals/WalletConnectModal/index.ts b/...on/components/WalletConnectModal/index.ts → ...ension/modals/WalletConnectModal/index.ts
diff --git a/src/extension/pages/AccountPage/AccountPage.tsx b/src/extension/pages/AccountPage/AccountPage.tsx
@@ -36,7 +36,6 @@ import {
 
 // components
 import ActivityTab from '@extension/components/ActivityTab';
-import AddAssetModal from '@extension/components/AddAssetModal';
 import AccountNftsTab from '@extension/components/AccountNftsTab';
 import AssetsTab from '@extension/components/AssetsTab';
 import CopyIconButton from '@extension/components/CopyIconButton';
@@ -49,7 +48,6 @@ import NetworkSelect, {
 import NativeBalance, {
   NativeBalanceSkeleton,
 } from '@extension/components/NativeBalance';
-import ShareAddressModal from '@extension/components/ShareAddressModal';
 
 // constants
 import { ADD_ACCOUNT_ROUTE, ACCOUNTS_ROUTE } from '@extension/constants';
@@ -67,6 +65,9 @@ import useDefaultTextColor from '@extension/hooks/useDefaultTextColor';
 import usePrimaryColorScheme from '@extension/hooks/usePrimaryColorScheme';
 import useSubTextColor from '@extension/hooks/useSubTextColor';
 
+// modals
+import ShareAddressModal from '@extension/modals//ShareAddressModal';
+
 // selectors
 import {
   useSelectAccountByAddress,

diff --git a/src/extension/pages/AssetPage/AssetPage.tsx b/src/extension/pages/AssetPage/AssetPage.tsx
@@ -21,7 +21,6 @@ import CopyIconButton from '@extension/components/CopyIconButton';
 import LoadingPage from '@extension/components/LoadingPage';
 import OpenTabIconButton from '@extension/components/OpenTabIconButton';
 import PageHeader from '@extension/components/PageHeader';
-import ShareAddressModal from '@extension/components/ShareAddressModal';
 
 // constants
 import { ACCOUNTS_ROUTE } from '@extension/constants';
@@ -36,6 +35,9 @@ import useSubTextColor from '@extension/hooks/useSubTextColor';
 import useTextBackgroundColor from '@extension/hooks/useTextBackgroundColor';
 import useAssetPage from './hooks/useAssetPage';
 
+// modals
+import ShareAddressModal from '@extension/modals//ShareAddressModal';
+
 // selectors
 import {
   useSelectFetchingStandardAssets,

diff --git a/src/extension/pages/ChangePasswordPage/ChangePasswordPage.tsx b/src/extension/pages/ChangePasswordPage/ChangePasswordPage.tsx
@@ -6,7 +6,6 @@ import { useDispatch } from 'react-redux';
 
 // components
 import Button from '@extension/components/Button';
-import ConfirmPasswordModal from '@extension/components/ConfirmPasswordModal';
 import CreatePasswordInput, {
   validate,
 } from '@extension/components/CreatePasswordInput';
@@ -26,6 +25,9 @@ import { create as createNotification } from '@extension/features/notifications'
 import useChangePassword from '@extension/hooks/useChangePassword';
 import useSubTextColor from '@extension/hooks/useSubTextColor';
 
+// modals
+import ConfirmPasswordModal from '@extension/modals//ConfirmPasswordModal';
+
 // types
 import { IAppThunkDispatch } from '@extension/types';
 

diff --git a/src/extension/pages/SessionsSettingsPage/SessionsSettingsPage.tsx b/src/extension/pages/SessionsSettingsPage/SessionsSettingsPage.tsx
@@ -17,7 +17,6 @@ import { useDispatch } from 'react-redux';
 // components
 import Button from '@extension/components/Button';
 import EmptyState from '@extension/components/EmptyState';
-import ManageSessionModal from '@extension/components/ManageSessionModal';
 import PageHeader from '@extension/components/PageHeader';
 import SettingsSessionItem from '@extension/components/SettingsSessionItem';
 
@@ -33,6 +32,9 @@ import {
 import useSubTextColor from '@extension/hooks/useSubTextColor';
 import useDefaultTextColor from '@extension/hooks/useDefaultTextColor';
 
+// modals
+import ManageSessionModal from '@extension/modals/ManageSessionModal';
+
 // selectors
 import {
   useSelectFetchingSessions,

diff --git a/...ion/pages/AccountRouter/AccountRouter.tsx → ...n/routers/AccountRouter/AccountRouter.tsx b/...ion/pages/AccountRouter/AccountRouter.tsx → ...n/routers/AccountRouter/AccountRouter.tsx
diff --git a/src/extension/pages/AccountRouter/index.ts → src/extension/routers/AccountRouter/index.ts b/src/extension/pages/AccountRouter/index.ts → src/extension/routers/AccountRouter/index.ts
diff --git a/...AddAccountRouter/MainAddAccountRouter.tsx → ...AddAccountRouter/MainAddAccountRouter.tsx b/...AddAccountRouter/MainAddAccountRouter.tsx → ...AddAccountRouter/MainAddAccountRouter.tsx
@@ -2,9 +2,6 @@ import React, { FC, useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { NavigateFunction, Route, Routes, useNavigate } from 'react-router-dom';
 
-// components
-import ConfirmPasswordModal from '@extension/components/ConfirmPasswordModal';
-
 // constants
 import {
   ACCOUNTS_ROUTE,
@@ -18,6 +15,9 @@ import {
   updateAccountsThunk,
 } from '@extension/features/accounts';
 
+// modals
+import ConfirmPasswordModal from '@extension/modals//ConfirmPasswordModal';
+
 // pages
 import AccountSetupPage from '@extension/pages/AccountSetupPage';
 import CreateNewAccountPage from '@extension/pages/CreateNewAccountPage';

diff --git a/...nsion/pages/MainAddAccountRouter/index.ts → ...ion/routers/MainAddAccountRouter/index.ts b/...nsion/pages/MainAddAccountRouter/index.ts → ...ion/routers/MainAddAccountRouter/index.ts
diff --git a/...ntRouter/RegistrationAddAccountRouter.tsx → ...ntRouter/RegistrationAddAccountRouter.tsx b/...ntRouter/RegistrationAddAccountRouter.tsx → ...ntRouter/RegistrationAddAccountRouter.tsx
diff --git a/...ges/RegistrationAddAccountRouter/index.ts → ...ers/RegistrationAddAccountRouter/index.ts b/...ges/RegistrationAddAccountRouter/index.ts → ...ers/RegistrationAddAccountRouter/index.ts
diff --git a/...n/pages/SettingsRouter/SettingsRouter.tsx → ...routers/SettingsRouter/SettingsRouter.tsx b/...n/pages/SettingsRouter/SettingsRouter.tsx → ...routers/SettingsRouter/SettingsRouter.tsx
diff --git a/src/extension/pages/SettingsRouter/index.ts → ...extension/routers/SettingsRouter/index.ts b/src/extension/pages/SettingsRouter/index.ts → ...extension/routers/SettingsRouter/index.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -51,7 +51,9 @@
       "@extension/features/system": ["src/extension/features/system"],
       "@extension/fonts/*": ["src/extension/fonts/*"],
       "@extension/hooks/*": ["src/extension/hooks/*"],
+      "@extension/modals/*": ["src/extension/modals/*"],
       "@extension/pages/*": ["src/extension/pages/*"],
+      "@extension/routers/*": ["src/extension/routers/*"],
       "@extension/selectors": ["src/extension/selectors"],
       "@extension/services": ["src/extension/services"],
       "@extension/styles/*": ["src/external/styles/*"],

diff --git a/webpack/utils/createCommonConfig.ts b/webpack/utils/createCommonConfig.ts
@@ -95,7 +95,9 @@ export default function createCommonConfig(): Configuration {
         ),
         ['@extension/fonts']: resolve(extensionPath, 'fonts'),
         ['@extension/hooks']: resolve(extensionPath, 'hooks'),
+        ['@extension/modals']: resolve(extensionPath, 'modals'),
         ['@extension/pages']: resolve(extensionPath, 'pages'),
+        ['@extension/routers']: resolve(extensionPath, 'routers'),
         ['@extension/selectors']: resolve(extensionPath, 'selectors'),
         ['@extension/services']: resolve(extensionPath, 'services'),
         ['@extension/styles']: resolve(extensionPath, 'styles'),