diff --git a/src/contract/factory.ts b/src/contract/factory.ts
index 2476b3c8..2872a2df 100644
--- a/src/contract/factory.ts
+++ b/src/contract/factory.ts
@@ -10,7 +10,8 @@ import type { BytesLike } from '../utils/index.js';
 import { getZoneForAddress, isQiAddress } from '../utils/index.js';
 import type { ContractInterface, ContractMethodArgs, ContractDeployTransaction, ContractRunner } from './types.js';
 import type { ContractTransactionResponse } from './wrappers.js';
-import { Wallet, randomBytes } from '../quais.js';
+import { Wallet } from '../wallet/index.js';
+import { randomBytes } from '../crypto/index.js';
 import { getContractAddress } from '../address/address.js';
 import { getStatic } from '../utils/properties.js';
 import { QuaiTransactionRequest } from '../providers/provider.js';
diff --git a/src/providers/provider-jsonrpc.ts b/src/providers/provider-jsonrpc.ts
index 77b952ba..66146248 100644
--- a/src/providers/provider-jsonrpc.ts
+++ b/src/providers/provider-jsonrpc.ts
@@ -13,7 +13,7 @@
 // https://playground.open-rpc.org/?schemaUrl=https://raw.githubusercontent.com/ethereum/eth1.0-apis/assembled-spec/openrpc.json&uiSchema%5BappBar%5D%5Bui:splitView%5D=true&uiSchema%5BappBar%5D%5Bui:input%5D=false&uiSchema%5BappBar%5D%5Bui:examplesDropdown%5D=false
 
 import { AbiCoder } from '../abi/index.js';
-import { getAddress } from '../address/index.js';
+import { getAddress, resolveAddress } from '../address/index.js';
 import { accessListify, QuaiTransactionLike } from '../transaction/index.js';
 import {
     getBigInt,
@@ -39,15 +39,9 @@ import type { PerformActionRequest, Subscriber, Subscription } from './abstract-
 import type { Networkish } from './network.js';
 import type { Provider, QuaiTransactionRequest, TransactionRequest, TransactionResponse } from './provider.js';
 import { Shard, toShard } from '../constants/index.js';
-import {
-    AbstractSigner,
-    resolveAddress,
-    Signer,
-    toUtf8Bytes,
-    TypedDataDomain,
-    TypedDataEncoder,
-    TypedDataField,
-} from '../quais';
+import { TypedDataDomain, TypedDataEncoder, TypedDataField } from '../hash/index.js';
+import { AbstractSigner, Signer } from '../signers/index.js';
+import { toUtf8Bytes } from '../encoding/index.js';
 import { addressFromTransactionRequest } from './provider.js';
 
 type Timer = ReturnType<typeof setTimeout>;