wallet-core: flatten directory structure

31 files changed, 147 insertions, 147 deletions

diff --git a/packages/taler-wallet-core/src/operations/attention.ts b/packages/taler-wallet-core/src/attention.ts
index 7d8b11e79..3be1f7197 100644
--- a/packages/taler-wallet-core/src/operations/attention.ts
+++ b/packages/taler-wallet-core/src/attention.ts
@@ -28,8 +28,8 @@ import {
   UserAttentionsRequest,
   UserAttentionsResponse,
 } from "@gnu-taler/taler-util";
-import { timestampPreciseFromDb, timestampPreciseToDb } from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
+import { timestampPreciseFromDb, timestampPreciseToDb } from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
 
 const logger = new Logger("operations/attention.ts");
 
diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/backup/index.ts
index 948b8eb85..c9ab6c5d9 100644
--- a/packages/taler-wallet-core/src/operations/backup/index.ts
+++ b/packages/taler-wallet-core/src/backup/index.ts
@@ -88,13 +88,13 @@ import {
   checkDbInvariant,
   checkLogicInvariant,
 } from "../../util/invariants.js";
-import { addAttentionRequest, removeAttentionRequest } from "../attention.js";
+import { addAttentionRequest, removeAttentionRequest } from "../../attention.js";
 import {
   TaskIdentifiers,
   TaskRunResult,
   TaskRunResultType,
-} from "../common.js";
-import { preparePayForUri } from "../pay-merchant.js";
+} from "../../common.js";
+import { preparePayForUri } from "../../pay-merchant.js";
 
 const logger = new Logger("operations/backup.ts");
 
diff --git a/packages/taler-wallet-core/src/operations/backup/state.ts b/packages/taler-wallet-core/src/backup/state.ts
index 72f850b25..72f850b25 100644
--- a/packages/taler-wallet-core/src/operations/backup/state.ts
+++ b/packages/taler-wallet-core/src/backup/state.ts
diff --git a/packages/taler-wallet-core/src/operations/balance.ts b/packages/taler-wallet-core/src/balance.ts
index 12f9795b2..700e2c5d7 100644
--- a/packages/taler-wallet-core/src/operations/balance.ts
+++ b/packages/taler-wallet-core/src/balance.ts
@@ -73,10 +73,10 @@ import {
   RefreshOperationStatus,
   WalletDbReadOnlyTransaction,
   WithdrawalGroupStatus,
-} from "../db.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { checkLogicInvariant } from "../util/invariants.js";
+} from "./db.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { checkLogicInvariant } from "./util/invariants.js";
 import {
   getExchangeScopeInfo,
   getExchangeWireDetailsInTx,
diff --git a/packages/taler-wallet-core/src/operations/common.ts b/packages/taler-wallet-core/src/common.ts
index 6bafa632e..ae1e17ffb 100644
--- a/packages/taler-wallet-core/src/operations/common.ts
+++ b/packages/taler-wallet-core/src/common.ts
@@ -56,11 +56,11 @@ import {
   WalletDbReadWriteTransaction,
   WithdrawalGroupRecord,
   timestampPreciseToDb,
-} from "../db.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType, TaskId } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
+} from "./db.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType, TaskId } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { checkDbInvariant, checkLogicInvariant } from "./util/invariants.js";
 import { createRefreshGroup } from "./refresh.js";
 
 const logger = new Logger("operations/common.ts");
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index f7fd8400d..12801194f 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -60,7 +60,7 @@ import {
   WithdrawalExchangeAccountDetails,
   codecForAny,
 } from "@gnu-taler/taler-util";
-import { DbRetryInfo, TaskIdentifiers } from "./operations/common.js";
+import { DbRetryInfo, TaskIdentifiers } from "./common.js";
 import {
   DbAccess,
   DbReadOnlyTransaction,
@@ -74,7 +74,7 @@ import {
   describeStore,
   describeStoreV2,
   openDatabase,
-} from "./util/query.js";
+} from "./query.js";
 
 /**
  * This file contains the database schema of the Taler wallet together
diff --git a/packages/taler-wallet-core/src/dbless.ts b/packages/taler-wallet-core/src/dbless.ts
index 4a7767771..968d3b958 100644
--- a/packages/taler-wallet-core/src/dbless.ts
+++ b/packages/taler-wallet-core/src/dbless.ts
@@ -64,11 +64,11 @@ import {
   ExchangeKeysDownloadResult,
   isWithdrawableDenom,
 } from "./index.js";
-import { assembleRefreshRevealRequest } from "./operations/refresh.js";
+import { assembleRefreshRevealRequest } from "./refresh.js";
 import {
   getBankStatusUrl,
   getBankWithdrawalInfo,
-} from "./operations/withdraw.js";
+} from "./withdraw.js";
 
 const logger = new Logger("dbless.ts");
 
diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/deposits.ts
index 415f3cd72..94e7f01ac 100644
--- a/packages/taler-wallet-core/src/operations/deposits.ts
+++ b/packages/taler-wallet-core/src/deposits.ts
@@ -69,7 +69,7 @@ import {
   stringToBytes,
 } from "@gnu-taler/taler-util";
 import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http";
-import { DepositElementStatus, DepositGroupRecord } from "../db.js";
+import { DepositElementStatus, DepositGroupRecord } from "./db.js";
 import {
   DepositOperationStatus,
   DepositTrackingInfo,
@@ -82,11 +82,11 @@ import {
   getTotalRefreshCost,
   timestampPreciseToDb,
   timestampProtocolToDb,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { selectPayCoinsNew } from "../util/coinSelection.js";
-import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { selectPayCoinsNew } from "./util/coinSelection.js";
+import { checkDbInvariant, checkLogicInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TombstoneTag,
diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/exchanges.ts
index 678e48fb9..4e1651ae0 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/exchanges.ts
@@ -94,7 +94,7 @@ import {
   ExchangeDetailsRecord,
   ExchangeEntryRecord,
   WalletStoresV1,
-} from "../db.js";
+} from "./db.js";
 import {
   ExchangeEntryDbRecordStatus,
   ExchangeEntryDbUpdateStatus,
@@ -112,11 +112,11 @@ import {
   timestampPreciseToDb,
   timestampProtocolFromDb,
   timestampProtocolToDb,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { checkDbInvariant } from "../util/invariants.js";
-import { DbReadOnlyTransaction } from "../util/query.js";
-import { WALLET_EXCHANGE_PROTOCOL_VERSION } from "../versions.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { checkDbInvariant } from "./util/invariants.js";
+import { DbReadOnlyTransaction } from "./query.js";
+import { WALLET_EXCHANGE_PROTOCOL_VERSION } from "./versions.js";
 import {
   TaskIdentifiers,
   TaskRunResult,
diff --git a/packages/taler-wallet-core/src/index.ts b/packages/taler-wallet-core/src/index.ts
index 0eca64d1f..280fc9147 100644
--- a/packages/taler-wallet-core/src/index.ts
+++ b/packages/taler-wallet-core/src/index.ts
@@ -19,7 +19,7 @@
  */
 
 // Util functionality
-export * from "./util/query.js";
+export * from "./query.js";
 
 export * from "./versions.js";
 
@@ -27,11 +27,11 @@ export * from "./db.js";
 
 // Crypto and crypto workers
 // export * from "./crypto/workers/nodeThreadWorker.js";
-export type { CryptoWorker } from "./crypto/workers/cryptoWorkerInterface.js";
 export {
-  CryptoWorkerFactory,
   CryptoDispatcher,
+  CryptoWorkerFactory,
 } from "./crypto/workers/crypto-dispatcher.js";
+export type { CryptoWorker } from "./crypto/workers/cryptoWorkerInterface.js";
 
 export * from "./pending-types.js";
 
@@ -39,20 +39,20 @@ export { InternalWalletState } from "./internal-wallet-state.js";
 export * from "./wallet-api-types.js";
 export * from "./wallet.js";
 
-export * from "./operations/backup/index.js";
+export * from "./backup/index.js";
 
-export * from "./operations/exchanges.js";
+export * from "./exchanges.js";
 
-export * from "./operations/withdraw.js";
-export * from "./operations/refresh.js";
+export * from "./refresh.js";
+export * from "./withdraw.js";
 
 export * from "./dbless.js";
 
-export * from "./crypto/cryptoTypes.js";
 export * from "./crypto/cryptoImplementation.js";
+export * from "./crypto/cryptoTypes.js";
 
-export * from "./util/timer.js";
 export * from "./util/denominations.js";
+export * from "./util/timer.js";
 
 export { SynchronousCryptoWorkerFactoryPlain } from "./crypto/workers/synchronousWorkerFactoryPlain.js";
 export * from "./host-common.js";
diff --git a/packages/taler-wallet-core/src/internal-wallet-state.ts b/packages/taler-wallet-core/src/internal-wallet-state.ts
index 3ff9d8064..255019d23 100644
--- a/packages/taler-wallet-core/src/internal-wallet-state.ts
+++ b/packages/taler-wallet-core/src/internal-wallet-state.ts
@@ -44,7 +44,7 @@ import {
   WalletStoresV1,
 } from "./db.js";
 import { TaskScheduler } from "./shepherd.js";
-import { DbAccess } from "./util/query.js";
+import { DbAccess } from "./query.js";
 import { TimerGroup } from "./util/timer.js";
 import { WalletConfig } from "./wallet-api-types.js";
 
diff --git a/packages/taler-wallet-core/src/operations/merchants.ts b/packages/taler-wallet-core/src/merchants.ts
index a148953f0..6400aad7d 100644
--- a/packages/taler-wallet-core/src/operations/merchants.ts
+++ b/packages/taler-wallet-core/src/merchants.ts
@@ -24,7 +24,7 @@ import {
   codecForMerchantConfigResponse,
   LibtoolVersion,
 } from "@gnu-taler/taler-util";
-import { InternalWalletState, MerchantInfo } from "../internal-wallet-state.js";
+import { InternalWalletState, MerchantInfo } from "./internal-wallet-state.js";
 import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http";
 
 const logger = new Logger("taler-wallet-core:merchants.ts");
diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
index 260fc815a..f294035e6 100644
--- a/packages/taler-wallet-core/src/operations/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -94,7 +94,7 @@ import {
   readUnexpectedResponseDetails,
   throwUnexpectedRequestError,
 } from "@gnu-taler/taler-util/http";
-import { EddsaKeypair } from "../crypto/cryptoImplementation.js";
+import { EddsaKeypair } from "./crypto/cryptoImplementation.js";
 import {
   CoinRecord,
   DenominationRecord,
@@ -102,7 +102,7 @@ import {
   PurchaseStatus,
   RefundReason,
   WalletStoresV1,
-} from "../db.js";
+} from "./db.js";
 import {
   getCandidateWithdrawalDenomsTx,
   PendingTaskType,
@@ -116,15 +116,15 @@ import {
   timestampProtocolToDb,
   WalletDbReadOnlyTransaction,
   WalletDbReadWriteTransaction,
-} from "../index.js";
+} from "./index.js";
 import {
   EXCHANGE_COINS_LOCK,
   InternalWalletState,
-} from "../internal-wallet-state.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { PreviousPayCoins, selectPayCoinsNew } from "../util/coinSelection.js";
-import { checkDbInvariant } from "../util/invariants.js";
-import { DbReadWriteTransaction, StoreNames } from "../util/query.js";
+} from "./internal-wallet-state.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { PreviousPayCoins, selectPayCoinsNew } from "./util/coinSelection.js";
+import { checkDbInvariant } from "./util/invariants.js";
+import { DbReadWriteTransaction, StoreNames } from "./query.js";
 import {
   constructTaskIdentifier,
   DbRetryInfo,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-common.ts b/packages/taler-wallet-core/src/pay-peer-common.ts
index ae6f98ccd..5d3aac915 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-common.ts
+++ b/packages/taler-wallet-core/src/pay-peer-common.ts
@@ -29,11 +29,11 @@ import {
   codecForTimestamp,
   codecOptional,
 } from "@gnu-taler/taler-util";
-import { SpendCoinDetails } from "../crypto/cryptoImplementation.js";
-import { PeerPushPaymentCoinSelection, ReserveRecord } from "../db.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import type { SelectedPeerCoin } from "../util/coinSelection.js";
-import { checkDbInvariant } from "../util/invariants.js";
+import { SpendCoinDetails } from "./crypto/cryptoImplementation.js";
+import { PeerPushPaymentCoinSelection, ReserveRecord } from "./db.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import type { SelectedPeerCoin } from "./util/coinSelection.js";
+import { checkDbInvariant } from "./util/invariants.js";
 import { getTotalRefreshCost } from "./refresh.js";
 import { getCandidateWithdrawalDenomsTx } from "./withdraw.js";
 
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
index e97466084..124496d02 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-credit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-pull-credit.ts
@@ -61,11 +61,11 @@ import {
   timestampOptionalPreciseFromDb,
   timestampPreciseFromDb,
   timestampPreciseToDb,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType, TaskId } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { checkDbInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType, TaskId } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { checkDbInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TaskRunResultType,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts b/packages/taler-wallet-core/src/pay-peer-pull-debit.ts
index 1504f3d83..f71fdcee7 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-pull-debit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-pull-debit.ts
@@ -74,10 +74,10 @@ import {
   WalletStoresV1,
   createRefreshGroup,
   timestampPreciseToDb,
-} from "../index.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { PeerCoinRepair, selectPeerCoins } from "../util/coinSelection.js";
-import { checkLogicInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { PeerCoinRepair, selectPeerCoins } from "./util/coinSelection.js";
+import { checkLogicInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TaskRunResultType,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts b/packages/taler-wallet-core/src/pay-peer-push-credit.ts
index 412631356..937ff7ff4 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-push-credit.ts
@@ -62,9 +62,9 @@ import {
   WithdrawalGroupStatus,
   WithdrawalRecordType,
   timestampPreciseToDb,
-} from "../index.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { checkDbInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { checkDbInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TaskRunResultType,
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
index 91c5430be..608434c9a 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-debit.ts
+++ b/packages/taler-wallet-core/src/pay-peer-push-debit.ts
@@ -47,7 +47,7 @@ import {
   readSuccessResponseJsonOrThrow,
   readTalerErrorResponse,
 } from "@gnu-taler/taler-util/http";
-import { EncryptContractRequest } from "../crypto/cryptoTypes.js";
+import { EncryptContractRequest } from "./crypto/cryptoTypes.js";
 import {
   PeerPushDebitRecord,
   PeerPushDebitStatus,
@@ -56,12 +56,12 @@ import {
   timestampPreciseToDb,
   timestampProtocolFromDb,
   timestampProtocolToDb,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType, TaskId } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { PeerCoinRepair, selectPeerCoins } from "../util/coinSelection.js";
-import { checkLogicInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType, TaskId } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { PeerCoinRepair, selectPeerCoins } from "./util/coinSelection.js";
+import { checkLogicInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TaskRunResultType,
diff --git a/packages/taler-wallet-core/src/pending-types.ts b/packages/taler-wallet-core/src/pending-types.ts
index 4dfad9389..1b3fa35d8 100644
--- a/packages/taler-wallet-core/src/pending-types.ts
+++ b/packages/taler-wallet-core/src/pending-types.ts
@@ -25,7 +25,7 @@
  * Imports.
  */
 import { TalerErrorDetail, AbsoluteTime } from "@gnu-taler/taler-util";
-import { DbRetryInfo } from "./operations/common.js";
+import { DbRetryInfo } from "./common.js";
 
 export enum PendingTaskType {
   ExchangeUpdate = "exchange-update",
diff --git a/packages/taler-wallet-core/src/util/query.ts b/packages/taler-wallet-core/src/query.ts
index 90a3cac70..90a3cac70 100644
--- a/packages/taler-wallet-core/src/util/query.ts
+++ b/packages/taler-wallet-core/src/query.ts
diff --git a/packages/taler-wallet-core/src/operations/recoup.ts b/packages/taler-wallet-core/src/recoup.ts
index b88115d8e..a2ffa4132 100644
--- a/packages/taler-wallet-core/src/operations/recoup.ts
+++ b/packages/taler-wallet-core/src/recoup.ts
@@ -50,10 +50,10 @@ import {
   WithdrawalGroupStatus,
   WithdrawalRecordType,
   timestampPreciseToDb,
-} from "../db.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType } from "../pending-types.js";
-import { checkDbInvariant } from "../util/invariants.js";
+} from "./db.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType } from "./pending-types.js";
+import { checkDbInvariant } from "./util/invariants.js";
 import {
   TaskRunResult,
   TransactionContext,
diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/refresh.ts
index ad9fdedb4..ea4190364 100644
--- a/packages/taler-wallet-core/src/operations/refresh.ts
+++ b/packages/taler-wallet-core/src/refresh.ts
@@ -59,12 +59,12 @@ import {
   readSuccessResponseJsonOrThrow,
   readUnexpectedResponseDetails,
 } from "@gnu-taler/taler-util/http";
-import { TalerCryptoInterface } from "../crypto/cryptoImplementation.js";
+import { TalerCryptoInterface } from "./crypto/cryptoImplementation.js";
 import {
   DerivedRefreshSession,
   RefreshNewDenomInfo,
-} from "../crypto/cryptoTypes.js";
-import { CryptoApiStoppedError } from "../crypto/workers/crypto-dispatcher.js";
+} from "./crypto/cryptoTypes.js";
+import { CryptoApiStoppedError } from "./crypto/workers/crypto-dispatcher.js";
 import {
   CoinRecord,
   CoinSourceType,
@@ -72,7 +72,7 @@ import {
   RefreshCoinStatus,
   RefreshGroupRecord,
   RefreshOperationStatus,
-} from "../db.js";
+} from "./db.js";
 import {
   getCandidateWithdrawalDenomsTx,
   PendingTaskType,
@@ -82,14 +82,14 @@ import {
   timestampPreciseToDb,
   WalletDbReadOnlyTransaction,
   WalletDbReadWriteTransaction,
-} from "../index.js";
+} from "./index.js";
 import {
   EXCHANGE_COINS_LOCK,
   InternalWalletState,
-} from "../internal-wallet-state.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { selectWithdrawalDenominations } from "../util/coinSelection.js";
-import { checkDbInvariant } from "../util/invariants.js";
+} from "./internal-wallet-state.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { selectWithdrawalDenominations } from "./util/coinSelection.js";
+import { checkDbInvariant } from "./util/invariants.js";
 import {
   constructTaskIdentifier,
   makeCoinAvailable,
diff --git a/packages/taler-wallet-core/src/operations/reward.ts b/packages/taler-wallet-core/src/reward.ts
index 7d826e630..da43e65b0 100644
--- a/packages/taler-wallet-core/src/operations/reward.ts
+++ b/packages/taler-wallet-core/src/reward.ts
@@ -28,10 +28,10 @@ import {
   TransactionState,
   TransactionType,
 } from "@gnu-taler/taler-util";
-import { RewardRecord, RewardRecordStatus } from "../db.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
+import { RewardRecord, RewardRecordStatus } from "./db.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
 import {
   TaskRunResult,
   TombstoneTag,
diff --git a/packages/taler-wallet-core/src/shepherd.ts b/packages/taler-wallet-core/src/shepherd.ts
index f9290cdd9..438b4cf84 100644
--- a/packages/taler-wallet-core/src/shepherd.ts
+++ b/packages/taler-wallet-core/src/shepherd.ts
@@ -45,7 +45,7 @@ import {
   timestampAbsoluteFromDb,
 } from "./index.js";
 import { InternalWalletState } from "./internal-wallet-state.js";
-import { processBackupForProvider } from "./operations/backup/index.js";
+import { processBackupForProvider } from "./backup/index.js";
 import {
   DbRetryInfo,
   TaskRunResult,
@@ -53,18 +53,18 @@ import {
   constructTaskIdentifier,
   getExchangeState,
   parseTaskIdentifier,
-} from "./operations/common.js";
-import { processDepositGroup } from "./operations/deposits.js";
-import { updateExchangeFromUrlHandler } from "./operations/exchanges.js";
-import { processPurchase } from "./operations/pay-merchant.js";
-import { processPeerPullCredit } from "./operations/pay-peer-pull-credit.js";
-import { processPeerPullDebit } from "./operations/pay-peer-pull-debit.js";
-import { processPeerPushCredit } from "./operations/pay-peer-push-credit.js";
-import { processPeerPushDebit } from "./operations/pay-peer-push-debit.js";
-import { processRecoupGroup } from "./operations/recoup.js";
-import { processRefreshGroup } from "./operations/refresh.js";
-import { constructTransactionIdentifier } from "./operations/transactions.js";
-import { processWithdrawalGroup } from "./operations/withdraw.js";
+} from "./common.js";
+import { processDepositGroup } from "./deposits.js";
+import { updateExchangeFromUrlHandler } from "./exchanges.js";
+import { processPurchase } from "./pay-merchant.js";
+import { processPeerPullCredit } from "./pay-peer-pull-credit.js";
+import { processPeerPullDebit } from "./pay-peer-pull-debit.js";
+import { processPeerPushCredit } from "./pay-peer-push-credit.js";
+import { processPeerPushDebit } from "./pay-peer-push-debit.js";
+import { processRecoupGroup } from "./recoup.js";
+import { processRefreshGroup } from "./refresh.js";
+import { constructTransactionIdentifier } from "./transactions.js";
+import { processWithdrawalGroup } from "./withdraw.js";
 import { PendingTaskType, TaskId } from "./pending-types.js";
 
 const logger = new Logger("shepherd.ts");
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/testing.ts
index 3c7845813..38b2471e3 100644
--- a/packages/taler-wallet-core/src/operations/testing.ts
+++ b/packages/taler-wallet-core/src/testing.ts
@@ -56,9 +56,9 @@ import {
   HttpRequestLibrary,
   readSuccessResponseJsonOrThrow,
 } from "@gnu-taler/taler-util/http";
-import { getRefreshesForTransaction } from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { checkLogicInvariant } from "../util/invariants.js";
+import { getRefreshesForTransaction } from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { checkLogicInvariant } from "./util/invariants.js";
 import { getBalances } from "./balance.js";
 import { createDepositGroup } from "./deposits.js";
 import { fetchFreshExchange } from "./exchanges.js";
diff --git a/packages/taler-wallet-core/src/operations/transactions.ts b/packages/taler-wallet-core/src/transactions.ts
index 1d3ea3d5a..4bd68e184 100644
--- a/packages/taler-wallet-core/src/operations/transactions.ts
+++ b/packages/taler-wallet-core/src/transactions.ts
@@ -67,7 +67,7 @@ import {
   WithdrawalGroupRecord,
   WithdrawalGroupStatus,
   WithdrawalRecordType,
-} from "../db.js";
+} from "./db.js";
 import {
   OPERATION_STATUS_ACTIVE_FIRST,
   OPERATION_STATUS_ACTIVE_LAST,
@@ -75,11 +75,11 @@ import {
   timestampPreciseFromDb,
   timestampProtocolFromDb,
   WalletDbReadOnlyTransaction,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
-import { PendingTaskType, TaskId } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
-import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
+import { PendingTaskType, TaskId } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
+import { checkDbInvariant, checkLogicInvariant } from "./util/invariants.js";
 import {
   constructTaskIdentifier,
   TaskIdentifiers,
diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts
index 0f6316bce..f33891c88 100644
--- a/packages/taler-wallet-core/src/util/coinSelection.ts
+++ b/packages/taler-wallet-core/src/util/coinSelection.ts
@@ -64,8 +64,8 @@ import { InternalWalletState } from "../internal-wallet-state.js";
 import {
   getMerchantPaymentBalanceDetails,
   getPeerPaymentBalanceDetailsInTx,
-} from "../operations/balance.js";
-import { getAutoRefreshExecuteThreshold } from "../operations/common.js";
+} from "../balance.js";
+import { getAutoRefreshExecuteThreshold } from "../common.js";
 import { checkDbInvariant, checkLogicInvariant } from "./invariants.js";
 
 const logger = new Logger("coinSelection.ts");
diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
index 190558e14..37842b223 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -144,8 +144,8 @@ import {
   BackupInfo,
   RemoveBackupProviderRequest,
   RunBackupCycleRequest,
-} from "./operations/backup/index.js";
-import { MerchantPaymentBalanceDetails } from "./operations/balance.js";
+} from "./backup/index.js";
+import { MerchantPaymentBalanceDetails } from "./balance.js";
 import { PendingOperationsResponse as PendingTasksResponse } from "./pending-types.js";
 
 export enum WalletApiOperation {
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 45970e770..2ddebd403 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -162,7 +162,7 @@ import {
   getUserAttentions,
   getUserAttentionsUnreadCount,
   markAttentionRequestAsRead,
-} from "./operations/attention.js";
+} from "./attention.js";
 import {
   addBackupProvider,
   codecForAddBackupProviderRequest,
@@ -174,14 +174,14 @@ import {
   removeBackupProvider,
   runBackupCycle,
   setWalletDeviceId,
-} from "./operations/backup/index.js";
-import { getBalanceDetail, getBalances } from "./operations/balance.js";
+} from "./backup/index.js";
+import { getBalanceDetail, getBalances } from "./balance.js";
 import {
   computeDepositTransactionStatus,
   createDepositGroup,
   generateDepositGroupTxId,
   prepareDepositGroup,
-} from "./operations/deposits.js";
+} from "./deposits.js";
 import {
   acceptExchangeTermsOfService,
   addPresetExchangeEntry,
@@ -192,7 +192,7 @@ import {
   getExchangeTos,
   listExchanges,
   lookupExchangeByUri,
-} from "./operations/exchanges.js";
+} from "./exchanges.js";
 import {
   computePayMerchantTransactionState,
   computeRefundTransactionState,
@@ -203,33 +203,33 @@ import {
   sharePayment,
   startQueryRefund,
   startRefundQueryForUri,
-} from "./operations/pay-merchant.js";
+} from "./pay-merchant.js";
 import {
   checkPeerPullPaymentInitiation,
   computePeerPullCreditTransactionState,
   initiatePeerPullPayment,
-} from "./operations/pay-peer-pull-credit.js";
+} from "./pay-peer-pull-credit.js";
 import {
   computePeerPullDebitTransactionState,
   confirmPeerPullDebit,
   preparePeerPullDebit,
-} from "./operations/pay-peer-pull-debit.js";
+} from "./pay-peer-pull-debit.js";
 import {
   computePeerPushCreditTransactionState,
   confirmPeerPushCredit,
   preparePeerPushCredit,
-} from "./operations/pay-peer-push-credit.js";
+} from "./pay-peer-push-credit.js";
 import {
   checkPeerPushDebit,
   computePeerPushDebitTransactionState,
   initiatePeerPushDebit,
-} from "./operations/pay-peer-push-debit.js";
-import { createRecoupGroup } from "./operations/recoup.js";
+} from "./pay-peer-push-debit.js";
+import { createRecoupGroup } from "./recoup.js";
 import {
   computeRefreshTransactionState,
   forceRefresh,
-} from "./operations/refresh.js";
-import { computeRewardTransactionStatus } from "./operations/reward.js";
+} from "./refresh.js";
+import { computeRewardTransactionStatus } from "./reward.js";
 import {
   runIntegrationTest,
   runIntegrationTest2,
@@ -238,7 +238,7 @@ import {
   waitUntilAllTransactionsFinal,
   waitUntilRefreshesDone,
   withdrawTestBalance,
-} from "./operations/testing.js";
+} from "./testing.js";
 import {
   abortTransaction,
   constructTransactionIdentifier,
@@ -251,14 +251,14 @@ import {
   resumeTransaction,
   retryTransaction,
   suspendTransaction,
-} from "./operations/transactions.js";
+} from "./transactions.js";
 import {
   acceptWithdrawalFromUri,
   computeWithdrawalTransactionStatus,
   createManualWithdrawal,
   getExchangeWithdrawalInfo,
   getWithdrawalDetailsForUri,
-} from "./operations/withdraw.js";
+} from "./withdraw.js";
 import { PendingOperationsResponse } from "./pending-types.js";
 import { TaskScheduler } from "./shepherd.js";
 import { assertUnreachable } from "./util/assertUnreachable.js";
@@ -270,7 +270,7 @@ import {
   getMaxPeerPushAmount,
 } from "./util/instructedAmountConversion.js";
 import { checkDbInvariant } from "./util/invariants.js";
-import { DbAccess } from "./util/query.js";
+import { DbAccess } from "./query.js";
 import { TimerAPI, TimerGroup } from "./util/timer.js";
 import {
   WALLET_BANK_CONVERSION_API_PROTOCOL_VERSION,
diff --git a/packages/taler-wallet-core/src/operations/withdraw.test.ts b/packages/taler-wallet-core/src/withdraw.test.ts
index 97a80ec26..3eb6413e4 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.test.ts
+++ b/packages/taler-wallet-core/src/withdraw.test.ts
@@ -20,8 +20,8 @@ import {
   DenominationRecord,
   DenominationVerificationStatus,
   timestampProtocolToDb,
-} from "../db.js";
-import { selectWithdrawalDenominations } from "../util/coinSelection.js";
+} from "./db.js";
+import { selectWithdrawalDenominations } from "./util/coinSelection.js";
 
 test("withdrawal selection bug repro", (t) => {
   const amount = {
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/withdraw.ts
index 542868de0..a986d00a9 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/withdraw.ts
@@ -85,7 +85,7 @@ import {
   readSuccessResponseJsonOrThrow,
   throwUnexpectedRequestError,
 } from "@gnu-taler/taler-util/http";
-import { EddsaKeypair } from "../crypto/cryptoImplementation.js";
+import { EddsaKeypair } from "./crypto/cryptoImplementation.js";
 import {
   CoinRecord,
   CoinSourceType,
@@ -99,14 +99,14 @@ import {
   WithdrawalGroupRecord,
   WithdrawalGroupStatus,
   WithdrawalRecordType,
-} from "../db.js";
+} from "./db.js";
 import {
   WalletDbReadOnlyTransaction,
   WalletDbReadWriteTransaction,
   isWithdrawableDenom,
   timestampPreciseToDb,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
+} from "./index.js";
+import { InternalWalletState } from "./internal-wallet-state.js";
 import {
   TaskRunResult,
   TaskRunResultType,
@@ -115,19 +115,19 @@ import {
   constructTaskIdentifier,
   makeCoinAvailable,
   makeCoinsVisible,
-} from "../operations/common.js";
-import { PendingTaskType, TaskId } from "../pending-types.js";
-import { assertUnreachable } from "../util/assertUnreachable.js";
+} from "./common.js";
+import { PendingTaskType, TaskId } from "./pending-types.js";
+import { assertUnreachable } from "./util/assertUnreachable.js";
 import {
   selectForcedWithdrawalDenominations,
   selectWithdrawalDenominations,
-} from "../util/coinSelection.js";
-import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
-import { DbAccess } from "../util/query.js";
+} from "./util/coinSelection.js";
+import { checkDbInvariant, checkLogicInvariant } from "./util/invariants.js";
+import { DbAccess } from "./query.js";
 import {
   WALLET_BANK_INTEGRATION_PROTOCOL_VERSION,
   WALLET_EXCHANGE_PROTOCOL_VERSION,
-} from "../versions.js";
+} from "./versions.js";
 import {
   ReadyExchangeSummary,
   fetchFreshExchange,