diff --git a/packages/stack/src/blockchain/base-blockchain.ts b/packages/stack/src/blockchain/base-blockchain.ts
index 58db6e3..0731388 100644
--- a/packages/stack/src/blockchain/base-blockchain.ts
+++ b/packages/stack/src/blockchain/base-blockchain.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from '../utils';
+import { EventEmitter } from '../utils/index.js';
 
 import {
   type BlockchainCallback,
diff --git a/packages/stack/src/blockchain/blockchain-electrum.ts b/packages/stack/src/blockchain/blockchain-electrum.ts
index a4cad0b..a089a20 100644
--- a/packages/stack/src/blockchain/blockchain-electrum.ts
+++ b/packages/stack/src/blockchain/blockchain-electrum.ts
@@ -5,7 +5,7 @@ import {
   type BlockchainUTXO,
 } from './types.js';
 
-import { type BaseStore, StoreInMemory } from '../storage';
+import { type BaseStore, StoreInMemory } from '../storage/index.js';
 
 import {
   Address,
diff --git a/packages/stack/src/storage/activities.ts b/packages/stack/src/storage/activities.ts
index 6b5f090..3d54476 100644
--- a/packages/stack/src/storage/activities.ts
+++ b/packages/stack/src/storage/activities.ts
@@ -1,7 +1,7 @@
 import { BaseStore } from './base-store.js';
 import { StoreComposite } from './store-composite.js';
 
-import { UUIDV7 } from '../utils';
+import { UUIDV7 } from '../utils/index.js';
 
 // Make the given property in a type optional.
 // TODO: This is an extremely useful utility. If we use it elsewhere, move to own "type-utils.ts" file.
diff --git a/packages/stack/src/storage/base-store.ts b/packages/stack/src/storage/base-store.ts
index b6d3400..d938f81 100644
--- a/packages/stack/src/storage/base-store.ts
+++ b/packages/stack/src/storage/base-store.ts
@@ -1,4 +1,4 @@
-import { EventEmitter, InverseBloomFilter } from '../utils';
+import { EventEmitter, InverseBloomFilter } from '../utils/index.js';
 import { Encrypter } from '@xocash/primitives';
 export type StorageOpts = {
   syncInMemory?: boolean;
diff --git a/packages/stack/src/storage/store-remote-http.ts b/packages/stack/src/storage/store-remote-http.ts
index 211a30d..6803438 100644
--- a/packages/stack/src/storage/store-remote-http.ts
+++ b/packages/stack/src/storage/store-remote-http.ts
@@ -1,5 +1,5 @@
 import { BaseStore } from './base-store.js';
-import { SSEClient } from '../utils';
+import { SSEClient } from '../utils/index.js';
 import {
   Bytes,
   Encrypter,
diff --git a/packages/stack/src/wallet/activities.ts b/packages/stack/src/wallet/activities.ts
index 5c71511..630f557 100644
--- a/packages/stack/src/wallet/activities.ts
+++ b/packages/stack/src/wallet/activities.ts
@@ -1,4 +1,4 @@
-import { type Activity } from '../storage';
+import { type Activity } from '../storage/index.js';
 
 //-----------------------------------------------------------------------------
 // Standardized Activities
diff --git a/packages/stack/src/wallet/base-wallet.ts b/packages/stack/src/wallet/base-wallet.ts
index 6cbcbf6..f96b2aa 100644
--- a/packages/stack/src/wallet/base-wallet.ts
+++ b/packages/stack/src/wallet/base-wallet.ts
@@ -5,9 +5,9 @@ import {
   type WalletTransactions,
 } from './types.js';
 
-import { type BlockchainUTXOs } from '../blockchain';
-import { type Activities } from '../storage';
-import { EventEmitter } from '../utils';
+import { type BlockchainUTXOs } from '../blockchain/index.js';
+import { type Activities } from '../storage/index.js';
+import { EventEmitter } from '../utils/index.js';
 
 import { type TokenBalances, type Address } from '@xocash/primitives';
 
diff --git a/packages/stack/src/wallet/types.ts b/packages/stack/src/wallet/types.ts
index 731b0d2..bfbc74c 100644
--- a/packages/stack/src/wallet/types.ts
+++ b/packages/stack/src/wallet/types.ts
@@ -3,8 +3,8 @@ import {
   type AddressStatusPayload,
   type BlockHeightPayload,
   type BlockchainTransaction,
-} from '../blockchain';
-import { type Activities, type BaseStore } from '../storage';
+} from '../blockchain/index.js';
+import { type Activities, type BaseStore } from '../storage/index.js';
 
 import { type Address, type ExtMap } from '@xocash/primitives';
 
diff --git a/packages/stack/src/wallet/wallet-hd.ts b/packages/stack/src/wallet/wallet-hd.ts
index 939090a..7c647f4 100644
--- a/packages/stack/src/wallet/wallet-hd.ts
+++ b/packages/stack/src/wallet/wallet-hd.ts
@@ -4,7 +4,7 @@ import { TransactionBuilder } from './transaction-builder.js';
 import { type WalletBlockchain, type WalletDependencies } from './types.js';
 import { WalletP2PKH } from './wallet-p2pkh.js';
 
-import { type BaseStore, Activities, StoreInMemory } from '../storage';
+import { type BaseStore, Activities, StoreInMemory } from '../storage/index.js';
 
 import {
   type TokenBalances,
diff --git a/packages/stack/src/wallet/wallet-p2pkh.ts b/packages/stack/src/wallet/wallet-p2pkh.ts
index d2a1c14..fdf34c1 100644
--- a/packages/stack/src/wallet/wallet-p2pkh.ts
+++ b/packages/stack/src/wallet/wallet-p2pkh.ts
@@ -9,8 +9,8 @@ import { TransactionBuilder } from './transaction-builder.js';
 import {
   type AddressStatusPayload,
   type BlockchainTransaction,
-} from '../blockchain';
-import { type BaseStore, Activities, StoreInMemory } from '../storage';
+} from '../blockchain/index.js';
+import { type BaseStore, Activities, StoreInMemory } from '../storage/index.js';
 
 import {
   ExtMap,