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.2",
+    "version": "2.18.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "cashtab",
-            "version": "2.18.2",
+            "version": "2.18.3",
             "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.2",
+    "version": "2.18.3",
     "private": true,
     "scripts": {
         "start": "node scripts/start.js",
diff --git a/cashtab/src/components/Receive/Receive.js b/cashtab/src/components/Receive/Receive.js
--- a/cashtab/src/components/Receive/Receive.js
+++ b/cashtab/src/components/Receive/Receive.js
@@ -6,7 +6,7 @@
 import styled from 'styled-components';
 import { WalletContext } from 'wallet/context';
 import { QRCode } from 'components/Receive/QRCode';
-import useWindowDimensions from 'hooks/useWindowDimensions';
+import useWindowDimensions from 'components/Receive/useWindowDimensions';
 
 const QrCodeCtn = styled.div``;
 
diff --git a/cashtab/src/hooks/useWindowDimensions.js b/cashtab/src/components/Receive/useWindowDimensions.js
rename from cashtab/src/hooks/useWindowDimensions.js
rename to cashtab/src/components/Receive/useWindowDimensions.js
diff --git a/cashtab/src/transactions/index.js b/cashtab/src/transactions/index.js
--- a/cashtab/src/transactions/index.js
+++ b/cashtab/src/transactions/index.js
@@ -45,7 +45,7 @@
  * Create and broadcast a standard eCash tx, i.e. from Cashtab to a p2pkh or p2sh destination address
  * No OP_RETURN, no etokens, one destination address
  * @param {object} chronik initialized instance of chronik-client
- * @param {object} wallet Cashtab object that stores wallet information, see hooks/useWallet.js
+ * @param {object} wallet Cashtab object that stores wallet information, see wallet/useWallet.js
  * @param {array} targetOutputs Array of objects containing keys for value and address, e.g. [{value: <satsToSend>, address: <destinationAddress>}]
  * @param {number} feeRate satoshis per byte
  * @param {number} chaintipBlockheight the current chaintip blockheight
diff --git a/cashtab/src/hooks/__tests__/useWallet.test.js b/cashtab/src/wallet/__tests__/useWallet.test.js
rename from cashtab/src/hooks/__tests__/useWallet.test.js
rename to cashtab/src/wallet/__tests__/useWallet.test.js
--- a/cashtab/src/hooks/__tests__/useWallet.test.js
+++ b/cashtab/src/wallet/__tests__/useWallet.test.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 useWallet from '../useWallet';
+import useWallet from 'wallet/useWallet';
 import { renderHook, waitFor, act } from '@testing-library/react';
 import 'fake-indexeddb/auto';
 import localforage from 'localforage';
@@ -11,7 +11,7 @@
     nonDefaultContactList,
     nonDefaultCashtabCache,
     mockIncomingTokenTxDetails,
-} from 'hooks/fixtures/mocks';
+} from 'wallet/fixtures/mocks';
 import appConfig from 'config/app';
 import { when } from 'jest-when';
 import {
diff --git a/cashtab/src/wallet/context.js b/cashtab/src/wallet/context.js
--- a/cashtab/src/wallet/context.js
+++ b/cashtab/src/wallet/context.js
@@ -4,7 +4,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import useWallet from 'hooks/useWallet';
+import useWallet from 'wallet/useWallet';
 
 export const WalletContext = React.createContext();
 
diff --git a/cashtab/src/hooks/fixtures/mocks.js b/cashtab/src/wallet/fixtures/mocks.js
rename from cashtab/src/hooks/fixtures/mocks.js
rename to cashtab/src/wallet/fixtures/mocks.js
diff --git a/cashtab/src/hooks/useWallet.js b/cashtab/src/wallet/useWallet.js
rename from cashtab/src/hooks/useWallet.js
rename to cashtab/src/wallet/useWallet.js