diff --git a/cashtab/package-lock.json b/cashtab/package-lock.json
--- a/cashtab/package-lock.json
+++ b/cashtab/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "cashtab",
-    "version": "2.18.3",
+    "version": "2.18.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "cashtab",
-            "version": "2.18.3",
+            "version": "2.18.4",
             "dependencies": {
                 "@ant-design/icons": "^5.3.0",
                 "@bitgo/utxo-lib": "^9.33.0",
diff --git a/cashtab/package.json b/cashtab/package.json
--- a/cashtab/package.json
+++ b/cashtab/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cashtab",
-    "version": "2.18.3",
+    "version": "2.18.4",
     "private": true,
     "scripts": {
         "start": "node scripts/start.js",
diff --git a/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js b/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
--- a/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
+++ b/cashtab/src/components/Airdrop/__tests__/Airdrop.test.js
@@ -12,7 +12,7 @@
     walletWithXecAndTokens,
     easterEggTokenChronikTokenDetails,
     easterEggTokenChronikGenesisTx,
-} from 'components/fixtures/mocks';
+} from 'components/App/fixtures/mocks';
 import {
     tokenUtxos,
     tokenUtxosDecimals,
@@ -26,8 +26,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Alias/__tests__/Alias.test.js b/cashtab/src/components/Alias/__tests__/Alias.test.js
--- a/cashtab/src/components/Alias/__tests__/Alias.test.js
+++ b/cashtab/src/components/Alias/__tests__/Alias.test.js
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import React from 'react';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import {
     aliasPricesResp,
     aliasAddressTwoRegisteredOnePending,
@@ -19,8 +19,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import appConfig from 'config/app';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
diff --git a/cashtab/src/components/Alias/fixtures/mocks.js b/cashtab/src/components/Alias/fixtures/mocks.js
--- a/cashtab/src/components/Alias/fixtures/mocks.js
+++ b/cashtab/src/components/Alias/fixtures/mocks.js
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 
 const defaultAddress = walletWithXecAndTokens.paths.get(1899).address;
 export const aliasAddressTwoRegisteredOnePending = {
diff --git a/cashtab/src/components/App.css b/cashtab/src/components/App/App.css
rename from cashtab/src/components/App.css
rename to cashtab/src/components/App/App.css
--- a/cashtab/src/components/App.css
+++ b/cashtab/src/components/App/App.css
@@ -1,14 +1,13 @@
 @font-face {
     font-family: 'Poppins';
     src: local('Poppins'),
-        url(../assets/fonts/Poppins-Regular.ttf) format('truetype');
+        url(assets/fonts/Poppins-Regular.ttf) format('truetype');
     font-weight: normal;
 }
 
 @font-face {
     font-family: 'Poppins';
-    src: local('Poppins'),
-        url(../assets/fonts/Poppins-Bold.ttf) format('truetype');
+    src: local('Poppins'), url(assets/fonts/Poppins-Bold.ttf) format('truetype');
     font-weight: 700;
 }
 
diff --git a/cashtab/src/components/App.js b/cashtab/src/components/App/App.js
rename from cashtab/src/components/App.js
rename to cashtab/src/components/App/App.js
--- a/cashtab/src/components/App.js
+++ b/cashtab/src/components/App/App.js
@@ -29,7 +29,7 @@
 import Configure from 'components/Configure/Configure';
 import SignVerifyMsg from 'components/SignVerifyMsg/SignVerifyMsg';
 import Swap from 'components/Swap/Swap';
-import NotFound from 'components/NotFound';
+import NotFound from 'components/App/NotFound';
 import OnBoarding from 'components/OnBoarding/OnBoarding';
 import { LoadingCtn } from 'components/Common/Atoms';
 import Cashtab from 'assets/cashtab_xec.png';
@@ -46,11 +46,11 @@
 // Easter egg imports not used in extension/src/components/App.js
 import TabCash from 'assets/tabcash.png';
 import { hasEnoughToken } from 'wallet';
-import ServiceWorkerWrapper from './Common/ServiceWorkerWrapper';
+import ServiceWorkerWrapper from 'components/Common/ServiceWorkerWrapper';
 import aliasSettings from 'config/alias';
-import WebApp from './AppModes/WebApp';
-import Extension from './AppModes/Extension';
-import ExtensionHeader from './Common/ExtensionHeader';
+import WebApp from 'components/AppModes/WebApp';
+import Extension from 'components/AppModes/Extension';
+import ExtensionHeader from 'components/Common/ExtensionHeader';
 import { WalletInfoCtn } from 'components/Common/Atoms';
 import WalletLabel from 'components/Common/WalletLabel.js';
 import BalanceHeader from 'components/Common/BalanceHeader';
diff --git a/cashtab/src/components/NotFound.js b/cashtab/src/components/App/NotFound.js
rename from cashtab/src/components/NotFound.js
rename to cashtab/src/components/App/NotFound.js
diff --git a/cashtab/src/components/__tests__/App.test.js b/cashtab/src/components/App/__tests__/App.test.js
rename from cashtab/src/components/__tests__/App.test.js
rename to cashtab/src/components/App/__tests__/App.test.js
--- a/cashtab/src/components/__tests__/App.test.js
+++ b/cashtab/src/components/App/__tests__/App.test.js
@@ -20,7 +20,7 @@
     validSavedWallets_pre_2_9_0,
     validSavedWallets,
     mockCacheWalletWithXecAndTokens,
-} from 'components/fixtures/mocks';
+} from 'components/App/fixtures/mocks';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
 import { when } from 'jest-when';
@@ -30,8 +30,8 @@
     initializeCashtabStateForTests,
     initializeCashtabStateAtLegacyWalletKeysForTests,
     prepareMockedChronikCallsForWallet,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import { explorer } from 'config/explorer';
 import { legacyMockTokenInfoById } from 'chronik/fixtures/chronikUtxos';
 import {
diff --git a/cashtab/src/components/fixtures/CashtabTestWrapper.js b/cashtab/src/components/App/fixtures/CashtabTestWrapper.js
rename from cashtab/src/components/fixtures/CashtabTestWrapper.js
rename to cashtab/src/components/App/fixtures/CashtabTestWrapper.js
--- a/cashtab/src/components/fixtures/CashtabTestWrapper.js
+++ b/cashtab/src/components/App/fixtures/CashtabTestWrapper.js
@@ -7,7 +7,7 @@
 import { theme } from 'assets/styles/theme';
 import { MemoryRouter } from 'react-router-dom';
 import { WalletProvider } from 'wallet/context';
-import App from 'components/App';
+import App from 'components/App/App';
 import PropTypes from 'prop-types';
 
 const CashtabTestWrapper = ({ chronik, route = '/wallet' }) => (
diff --git a/cashtab/src/components/fixtures/__tests__/CashtabTestWrapper.test.js b/cashtab/src/components/App/fixtures/__tests__/CashtabTestWrapper.test.js
rename from cashtab/src/components/fixtures/__tests__/CashtabTestWrapper.test.js
rename to cashtab/src/components/App/fixtures/__tests__/CashtabTestWrapper.test.js
--- a/cashtab/src/components/fixtures/__tests__/CashtabTestWrapper.test.js
+++ b/cashtab/src/components/App/fixtures/__tests__/CashtabTestWrapper.test.js
@@ -9,12 +9,12 @@
 import appConfig from 'config/app';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import CashtabTestWrapper from '../CashtabTestWrapper';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+} from 'components/App/fixtures/helpers';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/fixtures/__tests__/index.test.js b/cashtab/src/components/App/fixtures/__tests__/index.test.js
rename from cashtab/src/components/fixtures/__tests__/index.test.js
rename to cashtab/src/components/App/fixtures/__tests__/index.test.js
--- a/cashtab/src/components/fixtures/__tests__/index.test.js
+++ b/cashtab/src/components/App/fixtures/__tests__/index.test.js
@@ -2,12 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import vectors from 'components/fixtures/vectors';
+import vectors from 'components/App/fixtures/vectors';
 import {
     initializeCashtabStateForTests,
     initializeCashtabStateAtLegacyWalletKeysForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
+} from 'components/App/fixtures/helpers';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
 import { chronik as chronikConfig } from 'config/chronik';
diff --git a/cashtab/src/components/fixtures/helpers.js b/cashtab/src/components/App/fixtures/helpers.js
rename from cashtab/src/components/fixtures/helpers.js
rename to cashtab/src/components/App/fixtures/helpers.js
--- a/cashtab/src/components/fixtures/helpers.js
+++ b/cashtab/src/components/App/fixtures/helpers.js
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-import { MockChronikClient } from '../../../../modules/mock-chronik-client';
+import { MockChronikClient } from '../../../../../modules/mock-chronik-client';
 import { CashtabSettings } from 'config/cashtabSettings';
 import CashtabCache from 'config/CashtabCache';
 import { cashtabCacheToJSON, cashtabWalletToJSON } from 'helpers';
diff --git a/cashtab/src/components/fixtures/mocks.js b/cashtab/src/components/App/fixtures/mocks.js
rename from cashtab/src/components/fixtures/mocks.js
rename to cashtab/src/components/App/fixtures/mocks.js
diff --git a/cashtab/src/components/fixtures/vectors.js b/cashtab/src/components/App/fixtures/vectors.js
rename from cashtab/src/components/fixtures/vectors.js
rename to cashtab/src/components/App/fixtures/vectors.js
--- a/cashtab/src/components/fixtures/vectors.js
+++ b/cashtab/src/components/App/fixtures/vectors.js
@@ -6,7 +6,7 @@
     walletWithXecAndTokens_pre_2_1_0,
     walletWithXecAndTokens,
     validSavedWallets,
-} from 'components/fixtures/mocks';
+} from 'components/App/fixtures/mocks';
 
 export default {
     initializeCashtabStateAtLegacyWalletKeysForTests: {
diff --git a/cashtab/src/components/Configure/__tests__/Configure.test.js b/cashtab/src/components/Configure/__tests__/Configure.test.js
--- a/cashtab/src/components/Configure/__tests__/Configure.test.js
+++ b/cashtab/src/components/Configure/__tests__/Configure.test.js
@@ -3,8 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import React from 'react';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
-import { populatedContactList } from '../fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
+import { populatedContactList } from 'components/Configure/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent, {
     PointerEventsCheckLevel,
@@ -18,9 +18,9 @@
     initializeCashtabStateForTests,
     prepareMockedChronikCallsForWallet,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import { validSavedWallets } from 'components/fixtures/mocks';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import { validSavedWallets } from 'components/App/fixtures/mocks';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import * as bip39 from 'bip39';
 import { cashtabWalletsFromJSON } from 'helpers';
 
diff --git a/cashtab/src/components/Etokens/__tests__/CreateToken.test.js b/cashtab/src/components/Etokens/__tests__/CreateToken.test.js
--- a/cashtab/src/components/Etokens/__tests__/CreateToken.test.js
+++ b/cashtab/src/components/Etokens/__tests__/CreateToken.test.js
@@ -3,18 +3,18 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import React from 'react';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
+} from 'components/App/fixtures/helpers';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
 import { when } from 'jest-when';
 import appConfig from 'config/app';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js b/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
--- a/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
+++ b/cashtab/src/components/Etokens/__tests__/CreateTokenForm.test.js
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import React from 'react';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { render, screen } from '@testing-library/react';
 import userEvent, {
     PointerEventsCheckLevel,
@@ -13,12 +13,12 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
+} from 'components/App/fixtures/helpers';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
 import { when } from 'jest-when';
 import appConfig from 'config/app';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Home/__tests__/Home.test.js b/cashtab/src/components/Home/__tests__/Home.test.js
--- a/cashtab/src/components/Home/__tests__/Home.test.js
+++ b/cashtab/src/components/Home/__tests__/Home.test.js
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import React from 'react';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { walletWithZeroBalanceZeroHistory } from 'components/Home/fixtures/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
@@ -14,8 +14,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Receive/__tests__/Receive.test.js b/cashtab/src/components/Receive/__tests__/Receive.test.js
--- a/cashtab/src/components/Receive/__tests__/Receive.test.js
+++ b/cashtab/src/components/Receive/__tests__/Receive.test.js
@@ -8,7 +8,7 @@
 import userEvent, {
     PointerEventsCheckLevel,
 } from '@testing-library/user-event';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { when } from 'jest-when';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -16,8 +16,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js b/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
--- a/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
+++ b/cashtab/src/components/Send/__tests__/SendByUrlParams.test.js
@@ -5,7 +5,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import {
     SEND_ADDRESS_VALIDATION_ERRORS,
     SEND_AMOUNT_VALIDATION_ERRORS,
@@ -17,8 +17,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Send/__tests__/SendToken.test.js b/cashtab/src/components/Send/__tests__/SendToken.test.js
--- a/cashtab/src/components/Send/__tests__/SendToken.test.js
+++ b/cashtab/src/components/Send/__tests__/SendToken.test.js
@@ -14,12 +14,12 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import appConfig from 'config/app';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/components/Send/__tests__/SendXec.test.js b/cashtab/src/components/Send/__tests__/SendXec.test.js
--- a/cashtab/src/components/Send/__tests__/SendXec.test.js
+++ b/cashtab/src/components/Send/__tests__/SendXec.test.js
@@ -8,7 +8,7 @@
 import userEvent, {
     PointerEventsCheckLevel,
 } from '@testing-library/user-event';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import {
     SEND_ADDRESS_VALIDATION_ERRORS,
     SEND_AMOUNT_VALIDATION_ERRORS,
@@ -22,8 +22,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 import { CashtabSettings } from 'config/cashtabSettings';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
diff --git a/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js b/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
--- a/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
+++ b/cashtab/src/components/SignVerifyMsg/__tests__/SignVerifyMsg.test.js
@@ -8,7 +8,7 @@
 import userEvent, {
     PointerEventsCheckLevel,
 } from '@testing-library/user-event';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 import { when } from 'jest-when';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -16,8 +16,8 @@
 import {
     initializeCashtabStateForTests,
     clearLocalForage,
-} from 'components/fixtures/helpers';
-import CashtabTestWrapper from 'components/fixtures/CashtabTestWrapper';
+} from 'components/App/fixtures/helpers';
+import CashtabTestWrapper from 'components/App/fixtures/CashtabTestWrapper';
 
 // https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
 Object.defineProperty(window, 'matchMedia', {
diff --git a/cashtab/src/helpers/fixtures/vectors.js b/cashtab/src/helpers/fixtures/vectors.js
--- a/cashtab/src/helpers/fixtures/vectors.js
+++ b/cashtab/src/helpers/fixtures/vectors.js
@@ -19,7 +19,7 @@
     walletWithXecAndTokens_pre_2_9_0,
     validSavedWallets_pre_2_1_0,
     validSavedWallets_pre_2_9_0,
-} from 'components/fixtures/mocks';
+} from 'components/App/fixtures/mocks';
 import appConfig from 'config/app';
 // Test vectors for helper functions
 
diff --git a/cashtab/src/index.js b/cashtab/src/index.js
--- a/cashtab/src/index.js
+++ b/cashtab/src/index.js
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import App from './components/App';
+import App from 'components/App/App';
 import { WalletProvider } from 'wallet/context';
 import { HashRouter as Router } from 'react-router-dom';
 import GA from 'components/Common/GoogleAnalytics';
diff --git a/cashtab/src/utils/__tests__/cashMethods.test.js b/cashtab/src/utils/__tests__/cashMethods.test.js
--- a/cashtab/src/utils/__tests__/cashMethods.test.js
+++ b/cashtab/src/utils/__tests__/cashMethods.test.js
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import { getHashArrayFromWallet, sumOneToManyXec } from 'utils/cashMethods';
-import { walletWithXecAndTokens } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens } from 'components/App/fixtures/mocks';
 
 it(`sumOneToManyXec() correctly parses the value for a valid one to many send XEC transaction`, () => {
     const destinationAddressAndValueArray = [
diff --git a/cashtab/src/validation/fixtures/vectors.js b/cashtab/src/validation/fixtures/vectors.js
--- a/cashtab/src/validation/fixtures/vectors.js
+++ b/cashtab/src/validation/fixtures/vectors.js
@@ -15,7 +15,7 @@
     validWalletJson,
     validWalletJsonMultiPath,
 } from 'validation/fixtures/mocks';
-import { walletWithXecAndTokens_pre_2_9_0 } from 'components/fixtures/mocks';
+import { walletWithXecAndTokens_pre_2_9_0 } from 'components/App/fixtures/mocks';
 import { toXec } from 'wallet';
 import { cashtabWalletFromJSON } from 'helpers';
 
diff --git a/cashtab/src/wallet/__tests__/useWallet.test.js b/cashtab/src/wallet/__tests__/useWallet.test.js
--- a/cashtab/src/wallet/__tests__/useWallet.test.js
+++ b/cashtab/src/wallet/__tests__/useWallet.test.js
@@ -17,7 +17,7 @@
 import {
     clearLocalForage,
     initializeCashtabStateForTests,
-} from 'components/fixtures/helpers';
+} from 'components/App/fixtures/helpers';
 import aliasSettings from 'config/alias';
 import { cashtabCacheToJSON, storedCashtabCacheToMap } from 'helpers';
 import CashtabCache from 'config/CashtabCache';
@@ -25,7 +25,7 @@
     walletWithXecAndTokens,
     mockCacheWalletWithXecAndTokens,
     mockCachedInfoCashtabDark,
-} from 'components/fixtures/mocks';
+} from 'components/App/fixtures/mocks';
 
 describe('useWallet hook rendering in different localforage states', () => {
     const xecPrice = 0.00003;