diff --git a/src/AeSdk.ts b/src/AeSdk.ts
index 8c1660ee83..d8e99480bb 100644
--- a/src/AeSdk.ts
+++ b/src/AeSdk.ts
@@ -1,5 +1,5 @@
 import AeSdkBase, { Account } from './AeSdkBase'
-import AccountBase from './account/base'
+import AccountBase from './account/Base'
 import { decode, EncodedData } from './utils/encoder'
 import { UnavailableAccountError } from './utils/errors'
 
diff --git a/src/AeSdkAepp.ts b/src/AeSdkAepp.ts
index b444f68364..bd5e611aa8 100644
--- a/src/AeSdkAepp.ts
+++ b/src/AeSdkAepp.ts
@@ -1,10 +1,10 @@
 import AeSdkBase, { Account } from './AeSdkBase'
-import AccountBase from './account/base'
-import AccountRpc from './account/rpc'
+import AccountBase from './account/Base'
+import AccountRpc from './account/Rpc'
 import { decode, EncodedData } from './utils/encoder'
-import { Accounts, RPC_VERSION, WalletInfo, Network, WalletApi, AeppApi } from './utils/aepp-wallet-communication/rpc/types'
-import RpcClient from './utils/aepp-wallet-communication/rpc/RpcClient'
-import { METHODS, SUBSCRIPTION_TYPES } from './utils/aepp-wallet-communication/schema'
+import { Accounts, RPC_VERSION, WalletInfo, Network, WalletApi, AeppApi } from './aepp-wallet-communication/rpc/types'
+import RpcClient from './aepp-wallet-communication/rpc/RpcClient'
+import { METHODS, SUBSCRIPTION_TYPES } from './aepp-wallet-communication/schema'
 import {
   AlreadyConnectedError,
   NoWalletConnectedError,
@@ -12,8 +12,8 @@ import {
   UnAuthorizedAccountError,
   RpcConnectionError
 } from './utils/errors'
-import Node from './node'
-import BrowserConnection from './utils/aepp-wallet-communication/connection/Browser'
+import Node from './Node'
+import BrowserConnection from './aepp-wallet-communication/connection/Browser'
 
 /**
  * RPC handler for AEPP side
diff --git a/src/AeSdkBase.ts b/src/AeSdkBase.ts
index 627631e5a7..f87b247272 100644
--- a/src/AeSdkBase.ts
+++ b/src/AeSdkBase.ts
@@ -1,17 +1,17 @@
 import * as chainMethods from './chain'
 import * as txMethods from './tx'
-import * as aensMethods from './ae/aens'
-import * as spendMethods from './ae/spend'
-import * as oracleMethods from './ae/oracle'
-import * as contractMethods from './ae/contract'
+import * as aensMethods from './aens'
+import * as spendMethods from './spend'
+import * as oracleMethods from './oracle'
+import * as contractMethods from './contract/methods'
 import * as contractGaMethods from './contract/ga'
 import { _buildTx } from './tx'
 import { mapObject } from './utils/other'
-import Node, { getNetworkId } from './node'
+import Node, { getNetworkId } from './Node'
 import { AE_AMOUNT_FORMATS } from './utils/amount-formatter'
 import { AMOUNT, TX_TYPE } from './tx/builder/schema'
-import MemoryAccount, { Keypair } from './account/memory'
-import AccountBase, { isAccountBase } from './account/base'
+import MemoryAccount, { Keypair } from './account/Memory'
+import AccountBase, { isAccountBase } from './account/Base'
 import {
   CompilerError,
   DuplicateNodeError,
@@ -20,7 +20,7 @@ import {
   TypeError
 } from './utils/errors'
 import { EncodedData } from './utils/encoder'
-import Compiler from './contract/compiler'
+import Compiler from './contract/Compiler'
 
 export type Account = Keypair | AccountBase | any
 
diff --git a/src/AeSdkWallet.ts b/src/AeSdkWallet.ts
index 899a48e361..d4fb6c4042 100644
--- a/src/AeSdkWallet.ts
+++ b/src/AeSdkWallet.ts
@@ -2,15 +2,15 @@ import { v4 as uuid } from '@aeternity/uuid'
 import AeSdk from './AeSdk'
 import { Account } from './AeSdkBase'
 import verifyTransaction from './tx/validator'
-import RpcClient from './utils/aepp-wallet-communication/rpc/RpcClient'
+import RpcClient from './aepp-wallet-communication/rpc/RpcClient'
 import {
   METHODS, RPC_STATUS, SUBSCRIPTION_TYPES, WALLET_TYPE,
   RpcBroadcastError, RpcInvalidTransactionError,
   RpcNotAuthorizeError, RpcPermissionDenyError, RpcUnsupportedProtocolError
-} from './utils/aepp-wallet-communication/schema'
+} from './aepp-wallet-communication/schema'
 import { UnknownRpcClientError } from './utils/errors'
-import AccountBase from './account/base'
-import BrowserConnection from './utils/aepp-wallet-communication/connection/Browser'
+import AccountBase from './account/Base'
+import BrowserConnection from './aepp-wallet-communication/connection/Browser'
 import {
   Accounts,
   AeppApi,
@@ -18,7 +18,7 @@ import {
   RPC_VERSION,
   WalletApi,
   WalletInfo
-} from './utils/aepp-wallet-communication/rpc/types'
+} from './aepp-wallet-communication/rpc/types'
 import { EncodedData } from './utils/encoder'
 
 type RpcClientWallet = RpcClient<AeppApi, WalletApi>
diff --git a/src/node.ts b/src/Node.ts
similarity index 100%
rename from src/node.ts
rename to src/Node.ts
diff --git a/src/account/base.ts b/src/account/Base.ts
similarity index 98%
rename from src/account/base.ts
rename to src/account/Base.ts
index c6319daed5..4975e56520 100644
--- a/src/account/base.ts
+++ b/src/account/Base.ts
@@ -18,7 +18,7 @@ import { messageToHash, verifyMessage as verifyMessageCrypto, hash } from '../ut
 import { buildTx } from '../tx/builder'
 import { decode, EncodedData } from '../utils/encoder'
 import { TX_TYPE } from '../tx/builder/schema'
-import { getNetworkId } from '../node'
+import { getNetworkId } from '../Node'
 import { concatBuffers } from '../utils/other'
 
 /**
diff --git a/src/account/memory.ts b/src/account/Memory.ts
similarity index 98%
rename from src/account/memory.ts
rename to src/account/Memory.ts
index a6535e5f5c..6b14019fad 100644
--- a/src/account/memory.ts
+++ b/src/account/Memory.ts
@@ -14,7 +14,7 @@
  *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  *  PERFORMANCE OF THIS SOFTWARE.
  */
-import AccountBase from './base'
+import AccountBase from './Base'
 import { sign, isValidKeypair } from '../utils/crypto'
 import { isHex } from '../utils/string'
 import { decode } from '../tx/builder/helpers'
diff --git a/src/account/rpc.ts b/src/account/Rpc.ts
similarity index 95%
rename from src/account/rpc.ts
rename to src/account/Rpc.ts
index 50b8231387..7d6f790adb 100644
--- a/src/account/rpc.ts
+++ b/src/account/Rpc.ts
@@ -1,5 +1,5 @@
-import AccountBase from './base'
-import { METHODS } from '../utils/aepp-wallet-communication/schema'
+import AccountBase from './Base'
+import { METHODS } from '../aepp-wallet-communication/schema'
 import { NotImplementedError } from '../utils/errors'
 import { EncodedData } from '../utils/encoder'
 
diff --git a/src/ae/aens.ts b/src/aens.ts
similarity index 95%
rename from src/ae/aens.ts
rename to src/aens.ts
index fbc55e5139..8df97f0e2c 100644
--- a/src/ae/aens.ts
+++ b/src/aens.ts
@@ -23,18 +23,18 @@
  * repository.
  */
 
-import { salt } from '../utils/crypto'
-import { commitmentHash, isAuctionName, Pointer } from '../tx/builder/helpers'
-import { CLIENT_TTL, NAME_TTL, TX_TYPE, AensName } from '../tx/builder/schema'
-import { ArgumentError } from '../utils/errors'
-import { EncodedData } from '../utils/encoder'
+import { salt } from './utils/crypto'
+import { commitmentHash, isAuctionName, Pointer } from './tx/builder/helpers'
+import { CLIENT_TTL, NAME_TTL, TX_TYPE, AensName } from './tx/builder/schema'
+import { ArgumentError } from './utils/errors'
+import { EncodedData } from './utils/encoder'
 import BigNumber from 'bignumber.js'
 import { send } from './spend'
-import { getName, height } from '../chain'
-import { _buildTx, BuildTxOptions } from '../tx'
-import { TransformNodeType } from '../node'
-import { NameEntry } from '../apis/node'
-import AccountBase from '../account/base'
+import { getName, height } from './chain'
+import { _buildTx, BuildTxOptions } from './tx'
+import { TransformNodeType } from './Node'
+import { NameEntry } from './apis/node'
+import AccountBase from './account/Base'
 
 interface KeyPointers {
   [key: string]: string | Buffer
diff --git a/src/utils/aepp-wallet-communication/connection-proxy.ts b/src/aepp-wallet-communication/connection-proxy.ts
similarity index 100%
rename from src/utils/aepp-wallet-communication/connection-proxy.ts
rename to src/aepp-wallet-communication/connection-proxy.ts
diff --git a/src/utils/aepp-wallet-communication/connection/Browser.ts b/src/aepp-wallet-communication/connection/Browser.ts
similarity index 99%
rename from src/utils/aepp-wallet-communication/connection/Browser.ts
rename to src/aepp-wallet-communication/connection/Browser.ts
index 391d26f712..f8783d8497 100644
--- a/src/utils/aepp-wallet-communication/connection/Browser.ts
+++ b/src/aepp-wallet-communication/connection/Browser.ts
@@ -15,7 +15,7 @@
  *  PERFORMANCE OF THIS SOFTWARE.
  */
 
-import { AlreadyConnectedError, NoWalletConnectedError } from '../../errors'
+import { AlreadyConnectedError, NoWalletConnectedError } from '../../utils/errors'
 
 /**
  * Browser connection base interface
diff --git a/src/utils/aepp-wallet-communication/connection/BrowserRuntime.ts b/src/aepp-wallet-communication/connection/BrowserRuntime.ts
similarity index 100%
rename from src/utils/aepp-wallet-communication/connection/BrowserRuntime.ts
rename to src/aepp-wallet-communication/connection/BrowserRuntime.ts
diff --git a/src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts b/src/aepp-wallet-communication/connection/BrowserWindowMessage.ts
similarity index 98%
rename from src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts
rename to src/aepp-wallet-communication/connection/BrowserWindowMessage.ts
index 812d8bcd79..3259bd5456 100644
--- a/src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts
+++ b/src/aepp-wallet-communication/connection/BrowserWindowMessage.ts
@@ -17,7 +17,7 @@
 
 import BrowserConnection from './Browser'
 import { MESSAGE_DIRECTION } from '../schema'
-import { InternalError, RpcConnectionError } from '../../errors'
+import { InternalError, RpcConnectionError } from '../../utils/errors'
 
 export type ImplPostMessage = Pick<Window, 'addEventListener' | 'removeEventListener' | 'postMessage'>
 
diff --git a/src/utils/aepp-wallet-communication/rpc/RpcClient.ts b/src/aepp-wallet-communication/rpc/RpcClient.ts
similarity index 99%
rename from src/utils/aepp-wallet-communication/rpc/RpcClient.ts
rename to src/aepp-wallet-communication/rpc/RpcClient.ts
index ba9121bd7a..1167faaece 100644
--- a/src/utils/aepp-wallet-communication/rpc/RpcClient.ts
+++ b/src/aepp-wallet-communication/rpc/RpcClient.ts
@@ -1,6 +1,6 @@
 import { RpcError, RpcInternalError, RpcMethodNotFoundError } from '../schema'
 import BrowserConnection from '../connection/Browser'
-import { InvalidRpcMessageError, MissingCallbackError } from '../../errors'
+import { InvalidRpcMessageError, MissingCallbackError } from '../../utils/errors'
 
 interface JsonRpcRequest {
   jsonrpc: '2.0'
diff --git a/src/utils/aepp-wallet-communication/rpc/types.ts b/src/aepp-wallet-communication/rpc/types.ts
similarity index 96%
rename from src/utils/aepp-wallet-communication/rpc/types.ts
rename to src/aepp-wallet-communication/rpc/types.ts
index fdc6dad3a2..fcbd1460b4 100644
--- a/src/utils/aepp-wallet-communication/rpc/types.ts
+++ b/src/aepp-wallet-communication/rpc/types.ts
@@ -1,4 +1,4 @@
-import { EncodedData } from '../../encoder'
+import { EncodedData } from '../../utils/encoder'
 import { METHODS, SUBSCRIPTION_TYPES, WALLET_TYPE } from '../schema'
 
 export interface WalletInfo {
diff --git a/src/utils/aepp-wallet-communication/schema.ts b/src/aepp-wallet-communication/schema.ts
similarity index 97%
rename from src/utils/aepp-wallet-communication/schema.ts
rename to src/aepp-wallet-communication/schema.ts
index fa000f2089..0c2c4af117 100644
--- a/src/utils/aepp-wallet-communication/schema.ts
+++ b/src/aepp-wallet-communication/schema.ts
@@ -1,5 +1,5 @@
-import { EncodedData } from '../encoder'
-import { BaseError, InternalError } from '../errors'
+import { EncodedData } from '../utils/encoder'
+import { BaseError, InternalError } from '../utils/errors'
 
 export const enum MESSAGE_DIRECTION {
   to_waellet = 'to_waellet',
diff --git a/src/utils/aepp-wallet-communication/wallet-detector.ts b/src/aepp-wallet-communication/wallet-detector.ts
similarity index 97%
rename from src/utils/aepp-wallet-communication/wallet-detector.ts
rename to src/aepp-wallet-communication/wallet-detector.ts
index adaa5c98d3..2b5b02bcda 100644
--- a/src/utils/aepp-wallet-communication/wallet-detector.ts
+++ b/src/aepp-wallet-communication/wallet-detector.ts
@@ -18,7 +18,7 @@
 import BrowserConnection from './connection/Browser'
 import BrowserWindowMessageConnection from './connection/BrowserWindowMessage'
 import { MESSAGE_DIRECTION, METHODS } from './schema'
-import { UnsupportedPlatformError } from '../errors'
+import { UnsupportedPlatformError } from '../utils/errors'
 
 interface Wallet {
   info: {
diff --git a/src/chain.ts b/src/chain.ts
index 05149cd931..eb0edb7903 100644
--- a/src/chain.ts
+++ b/src/chain.ts
@@ -23,13 +23,13 @@ import {
   AensPointerContextError, DryRunError, InvalidAensNameError, InvalidTxError,
   RequestTimedOutError, TxTimedOutError, TxNotInChainError, InternalError
 } from './utils/errors'
-import Node, { TransformNodeType } from './node'
+import Node, { TransformNodeType } from './Node'
 import {
   Account as AccountNode, ByteCode, ContractObject, DryRunResult, DryRunResults,
   Generation, KeyBlock, MicroBlockHeader, NameEntry, SignedTx
 } from './apis/node'
 import { EncodedData } from './utils/encoder'
-import AccountBase from './account/base'
+import AccountBase from './account/Base'
 
 export function _getPollInterval (
   type: 'block' | 'microblock',
diff --git a/src/contract/compiler.ts b/src/contract/Compiler.ts
similarity index 100%
rename from src/contract/compiler.ts
rename to src/contract/Compiler.ts
diff --git a/src/contract/aci.ts b/src/contract/aci.ts
index 1a2bc4bc1e..58ab7303e8 100644
--- a/src/contract/aci.ts
+++ b/src/contract/aci.ts
@@ -19,7 +19,7 @@ import { Encoder as Calldata } from '@aeternity/aepp-calldata'
 import { DRY_RUN_ACCOUNT, GAS_MAX, TX_TYPE, AMOUNT, AensName } from '../tx/builder/schema'
 import { buildContractIdByContractTx, unpackTx } from '../tx/builder'
 import { _buildTx } from '../tx'
-import { send } from '../ae/spend'
+import { send } from '../spend'
 import { decode, EncodedData, EncodingType } from '../utils/encoder'
 import {
   MissingContractDefError,
@@ -40,12 +40,12 @@ import {
 } from '../utils/errors'
 import { hash } from '../utils/crypto'
 import { Aci as BaseAci } from '../apis/compiler'
-import Compiler from './compiler'
-import Node from '../node'
+import Compiler from './Compiler'
+import Node from '../Node'
 import {
   getAccount, getContract, getContractByteCode, getKeyBlock, resolveName, txDryRun
 } from '../chain'
-import AccountBase from '../account/base'
+import AccountBase from '../account/Base'
 
 interface FunctionACI {
   arguments: any[]
diff --git a/src/contract/ga.ts b/src/contract/ga.ts
index 71ad9a7e32..5cffe67ec1 100644
--- a/src/contract/ga.ts
+++ b/src/contract/ga.ts
@@ -26,12 +26,12 @@ import { hash } from '../utils/crypto'
 import { decode, EncodedData } from '../utils/encoder'
 import { IllegalArgumentError, MissingParamError, InvalidAuthDataError } from '../utils/errors'
 import { concatBuffers } from '../utils/other'
-import AccountBase from '../account/base'
-import { getContractInstance } from '../ae/contract'
-import { send } from '../ae/spend'
-import Node from '../node'
+import AccountBase from '../account/Base'
+import { getContractInstance } from './methods'
+import { send } from '../spend'
+import Node from '../Node'
 import { getAccount } from '../chain'
-import Compiler from './compiler'
+import Compiler from './Compiler'
 
 /**
  * Check if account is GA
diff --git a/src/ae/contract.ts b/src/contract/methods.ts
similarity index 96%
rename from src/ae/contract.ts
rename to src/contract/methods.ts
index 5fd386a888..828713ccbb 100644
--- a/src/ae/contract.ts
+++ b/src/contract/methods.ts
@@ -26,9 +26,9 @@ import { AensName } from '../tx/builder/schema'
 import { decode, produceNameId } from '../tx/builder/helpers'
 import { concatBuffers } from '../utils/other'
 import { EncodedData, EncodingType } from '../utils/encoder'
-import AccountBase from '../account/base'
-import Node from '../node'
-export { default as getContractInstance } from '../contract/aci'
+import AccountBase from '../account/Base'
+import Node from '../Node'
+export { default as getContractInstance } from './aci'
 
 /**
  * Utility method to create a delegate signature for a contract
diff --git a/src/index.ts b/src/index.ts
index 5406091ea5..503d686d7f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -25,27 +25,27 @@ export * from './tx/builder/helpers'
 export * from './tx/builder/schema'
 export * from './utils/amount-formatter'
 export * from './utils/hd-wallet'
-export * from './ae/aens'
-export * from './ae/contract'
-export * from './ae/oracle'
-export * from './ae/spend'
+export * from './aens'
+export * from './contract/methods'
+export * from './oracle'
+export * from './spend'
 export * from './contract/ga'
 
 export { default as AeSdkBase } from './AeSdkBase'
 export { default as AeSdk } from './AeSdk'
 export { default as AeSdkAepp } from './AeSdkAepp'
 export { default as AeSdkWallet } from './AeSdkWallet'
-export { default as Node } from './node'
+export { default as Node } from './Node'
 export { default as verifyTransaction } from './tx/validator'
 export { default as calculateMinFee } from './tx/min-fee'
-export { default as AccountBase } from './account/base'
-export { default as MemoryAccount } from './account/memory'
-export { default as Compiler } from './contract/compiler'
+export { default as AccountBase } from './account/Base'
+export { default as MemoryAccount } from './account/Memory'
+export { default as Compiler } from './contract/Compiler'
 export { default as Channel } from './channel'
 
-export { default as connectionProxy } from './utils/aepp-wallet-communication/connection-proxy'
-export * from './utils/aepp-wallet-communication/schema'
-export { default as walletDetector } from './utils/aepp-wallet-communication/wallet-detector'
-export { default as BrowserRuntimeConnection } from './utils/aepp-wallet-communication/connection/BrowserRuntime'
-export { default as BrowserWindowMessageConnection } from './utils/aepp-wallet-communication/connection/BrowserWindowMessage'
+export { default as connectionProxy } from './aepp-wallet-communication/connection-proxy'
+export * from './aepp-wallet-communication/schema'
+export { default as walletDetector } from './aepp-wallet-communication/wallet-detector'
+export { default as BrowserRuntimeConnection } from './aepp-wallet-communication/connection/BrowserRuntime'
+export { default as BrowserWindowMessageConnection } from './aepp-wallet-communication/connection/BrowserWindowMessage'
 export * from './utils/errors'
diff --git a/src/ae/oracle.ts b/src/oracle.ts
similarity index 96%
rename from src/ae/oracle.ts
rename to src/oracle.ts
index ec91facfac..4537ceda27 100644
--- a/src/ae/oracle.ts
+++ b/src/oracle.ts
@@ -24,9 +24,9 @@
  */
 
 import { send } from './spend'
-import { mapObject, pause } from '../utils/other'
-import { oracleQueryId, decode, encode } from '../tx/builder/helpers'
-import { unpackTx } from '../tx/builder'
+import { mapObject, pause } from './utils/other'
+import { oracleQueryId, decode, encode } from './tx/builder/helpers'
+import { unpackTx } from './tx/builder'
 import {
   ORACLE_TTL,
   ORACLE_TTL_TYPES,
@@ -34,14 +34,14 @@ import {
   QUERY_TTL,
   RESPONSE_TTL,
   TX_TYPE
-} from '../tx/builder/schema'
-import { RequestTimedOutError } from '../utils/errors'
-import { EncodedData } from '../utils/encoder'
-import { _getPollInterval } from '../chain'
-import { _buildTx, BuildTxOptions } from '../tx'
-import Node from '../node'
+} from './tx/builder/schema'
+import { RequestTimedOutError } from './utils/errors'
+import { EncodedData } from './utils/encoder'
+import { _getPollInterval } from './chain'
+import { _buildTx, BuildTxOptions } from './tx'
+import Node from './Node'
 import BigNumber from 'bignumber.js'
-import AccountBase from '../account/base'
+import AccountBase from './account/Base'
 
 type OracleQueries = Awaited<ReturnType<Node['getOracleQueriesByPubkey']>>['oracleQueries']
 
diff --git a/src/ae/spend.ts b/src/spend.ts
similarity index 93%
rename from src/ae/spend.ts
rename to src/spend.ts
index 0eb6429c46..01db10e71b 100644
--- a/src/ae/spend.ts
+++ b/src/spend.ts
@@ -14,15 +14,15 @@
  *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  *  PERFORMANCE OF THIS SOFTWARE.
  */
-import { sendTransaction, getAccount, getBalance, resolveName } from '../chain'
-import { _buildTx, BuildTxOptions } from '../tx'
-import { buildTxHash, unpackTx } from '../tx/builder'
+import { sendTransaction, getAccount, getBalance, resolveName } from './chain'
+import { _buildTx, BuildTxOptions } from './tx'
+import { buildTxHash, unpackTx } from './tx/builder'
 import BigNumber from 'bignumber.js'
-import { ArgumentError } from '../utils/errors'
-import { EncodedData } from '../utils/encoder'
-import { createMetaTx } from '../contract/ga'
-import { TX_TYPE, AensName } from '../tx/builder/schema'
-import AccountBase from '../account/base'
+import { ArgumentError } from './utils/errors'
+import { EncodedData } from './utils/encoder'
+import { createMetaTx } from './contract/ga'
+import { TX_TYPE, AensName } from './tx/builder/schema'
+import AccountBase from './account/Base'
 
 /**
  * Sign and post a transaction to the chain
diff --git a/src/tx/index.ts b/src/tx/index.ts
index 8740352f34..8945f6456a 100644
--- a/src/tx/index.ts
+++ b/src/tx/index.ts
@@ -29,7 +29,7 @@ import {
   ArgumentError, UnsupportedProtocolError, UnknownTxError, InvalidTxParamsError
 } from '../utils/errors'
 import BigNumber from 'bignumber.js'
-import Node from '../node'
+import Node from '../Node'
 import { EncodedData } from '../utils/encoder'
 import { buildTx as syncBuildTx, unpackTx } from './builder/index'
 import calculateMinFee from './min-fee'
diff --git a/src/tx/validator.ts b/src/tx/validator.ts
index c66360248f..acb1337943 100644
--- a/src/tx/validator.ts
+++ b/src/tx/validator.ts
@@ -9,7 +9,7 @@ import calculateMinFee from './min-fee'
 import { UnsupportedProtocolError } from '../utils/errors'
 import { concatBuffers, isKeyOfObject } from '../utils/other'
 import { EncodedData } from '../utils/encoder'
-import Node from '../node'
+import Node from '../Node'
 
 interface Account {
   balance: bigint
diff --git a/test/integration/accounts.ts b/test/integration/accounts.ts
index f26e494200..e34563e6b2 100644
--- a/test/integration/accounts.ts
+++ b/test/integration/accounts.ts
@@ -20,7 +20,7 @@ import { expect } from 'chai'
 import { getSdk, BaseAe, networkId } from '.'
 import { generateKeyPair } from '../../src/utils/crypto'
 import BigNumber from 'bignumber.js'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import { AE_AMOUNT_FORMATS } from '../../src/utils/amount-formatter'
 import {
   UnavailableAccountError,
diff --git a/test/integration/channel.ts b/test/integration/channel.ts
index 2b2e179427..ee581aa59f 100644
--- a/test/integration/channel.ts
+++ b/test/integration/channel.ts
@@ -25,7 +25,7 @@ import { unpackTx, buildTx, buildTxHash } from '../../src/tx/builder'
 import { TX_TYPE } from '../../src/tx/builder/schema'
 import Channel from '../../src/channel'
 import { ChannelOptions, send } from '../../src/channel/internal'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import {
   IllegalArgumentError,
   InsufficientBalanceError,
diff --git a/test/integration/ga.ts b/test/integration/ga.ts
index 3a8c1fd535..3e5b6ed99f 100644
--- a/test/integration/ga.ts
+++ b/test/integration/ga.ts
@@ -20,7 +20,7 @@ import { expect } from 'chai'
 import { getSdk } from '.'
 import { generateKeyPair } from '../../src/utils/crypto'
 import { encode } from '../../src/utils/encoder'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import { unpackTx } from '../../src/tx/builder'
 import { ContractInstance } from '../../src/contract/aci'
 import { AeSdk, TX_TYPE, UnexpectedTsError } from '../../src'
diff --git a/test/integration/node.ts b/test/integration/node.ts
index 088cf64ab6..569b74d8e0 100644
--- a/test/integration/node.ts
+++ b/test/integration/node.ts
@@ -15,7 +15,7 @@
  *  PERFORMANCE OF THIS SOFTWARE.
  */
 
-import Node from '../../src/node'
+import Node from '../../src/Node'
 import AeSdkBase from '../../src/AeSdkBase'
 import { url, ignoreVersion } from '.'
 import { describe, it, before } from 'mocha'
diff --git a/test/integration/oracle.ts b/test/integration/oracle.ts
index e42d05fc5d..b6c88ea2e4 100644
--- a/test/integration/oracle.ts
+++ b/test/integration/oracle.ts
@@ -19,10 +19,10 @@ import { describe, it, before } from 'mocha'
 import { expect } from 'chai'
 import { getSdk } from '.'
 import { generateKeyPair } from '../../src/utils/crypto'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import { ORACLE_TTL_TYPES, QUERY_FEE } from '../../src/tx/builder/schema'
 import { decode } from '../../src/tx/builder/helpers'
-import { postQueryToOracle, registerOracle } from '../../src/ae/oracle'
+import { postQueryToOracle, registerOracle } from '../../src/oracle'
 import { EncodedData } from '../../src/utils/encoder'
 import { AeSdk, UnexpectedTsError } from '../../src'
 
diff --git a/test/integration/rpc.ts b/test/integration/rpc.ts
index 5045ebbd0f..198b2f9eea 100644
--- a/test/integration/rpc.ts
+++ b/test/integration/rpc.ts
@@ -43,9 +43,9 @@ import {
   UnsubscribedAccountError
 } from '../../src'
 import { concatBuffers } from '../../src/utils/other'
-import { ImplPostMessage } from '../../src/utils/aepp-wallet-communication/connection/BrowserWindowMessage'
+import { ImplPostMessage } from '../../src/aepp-wallet-communication/connection/BrowserWindowMessage'
 import { account, compilerUrl, ignoreVersion, networkId, spendPromise, url } from '.'
-import { Accounts, Network } from '../../src/utils/aepp-wallet-communication/rpc/types'
+import { Accounts, Network } from '../../src/aepp-wallet-communication/rpc/types'
 import { EncodedData, EncodingType } from '../../src/utils/encoder'
 
 const WindowPostMessageFake = (
diff --git a/test/integration/txVerification.ts b/test/integration/txVerification.ts
index 091330af88..83740ae1ad 100644
--- a/test/integration/txVerification.ts
+++ b/test/integration/txVerification.ts
@@ -2,7 +2,7 @@ import { before, describe, it } from 'mocha'
 import { expect } from 'chai'
 import { getSdk } from '.'
 import { generateKeyPair } from '../../src/utils/crypto'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import verifyTransaction from '../../src/tx/validator'
 import { InvalidTxError, InvalidTxParamsError } from '../../src/utils/errors'
 import { TX_TYPE } from '../../src/tx/builder/schema'
diff --git a/test/unit/memory-account.ts b/test/unit/memory-account.ts
index e5ec7895cd..19ceabd882 100644
--- a/test/unit/memory-account.ts
+++ b/test/unit/memory-account.ts
@@ -18,7 +18,7 @@
 import '..'
 import { describe, it } from 'mocha'
 import { expect } from 'chai'
-import MemoryAccount from '../../src/account/memory'
+import MemoryAccount from '../../src/account/Memory'
 import { generateKeyPair } from '../../src/utils/crypto'
 import { InvalidKeypairError, DecodeError } from '../../src/utils/errors'
 import { EncodedData } from '../../src/utils/encoder'