diff --git a/src/@types/Asset.ts b/src/@types/Asset.ts
index b3ecc835..3d679280 100644
--- a/src/@types/Asset.ts
+++ b/src/@types/Asset.ts
@@ -1,4 +1,4 @@
-import { DDO } from './DDO/DDO'
+import { DDO } from '.'
 
 export interface AssetNft {
   /**
diff --git a/src/@types/Compute.ts b/src/@types/Compute.ts
index 39b8edf1..81142c7c 100644
--- a/src/@types/Compute.ts
+++ b/src/@types/Compute.ts
@@ -1,4 +1,4 @@
-import { Metadata, MetadataAlgorithm } from './DDO/Metadata'
+import { Metadata, MetadataAlgorithm } from '.'
 
 export type ComputeResultType =
   | 'algorithmLog'
diff --git a/src/@types/DDO/DDO.ts b/src/@types/DDO/DDO.ts
index 7c88def6..0a6d0e24 100644
--- a/src/@types/DDO/DDO.ts
+++ b/src/@types/DDO/DDO.ts
@@ -1,7 +1,4 @@
-import { Service } from './Service'
-import { Metadata } from './Metadata'
-import { Credentials } from './Credentials'
-import { Event } from './Event'
+import { Service, Metadata, Credentials, Event } from '..'
 
 /**
  * DID Descriptor Object.
diff --git a/src/@types/index.ts b/src/@types/index.ts
index 7e03cb56..dbadc5be 100644
--- a/src/@types/index.ts
+++ b/src/@types/index.ts
@@ -1,14 +1,16 @@
-export * from './DDO/DDO'
-export * from './Asset'
-export * from './DDO/Service'
 export * from './DDO/Credentials'
+export * from './DDO/DDO'
+export * from './DDO/Event'
 export * from './DDO/Metadata'
-export * from './FileMetadata'
+export * from './DDO/Service'
+export * from './Asset'
 export * from './Compute'
-export * from './Provider'
-export * from './FixedPrice'
-export * from './Pool'
+export * from './Dispenser'
+export * from './DownloadResponse'
 export * from './Erc20'
 export * from './Erc721'
-export * from './Dispenser'
+export * from './FileMetadata'
+export * from './FixedPrice'
+export * from './Pool'
+export * from './Provider'
 export * from './Router'
diff --git a/src/config/Config.ts b/src/config/Config.ts
index 7b6c12bb..d10aad7b 100644
--- a/src/config/Config.ts
+++ b/src/config/Config.ts
@@ -1,5 +1,5 @@
-import { LogLevel } from '../utils/Logger'
 import { AbiItem } from 'web3-utils/types'
+import { LogLevel } from '../utils'
 
 export class Config {
   /**
@@ -195,5 +195,3 @@ export class Config {
    */
   gasFeeMultiplier: number
 }
-
-export default Config
diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts
index bbe0adda..dfb96477 100644
--- a/src/config/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -1,6 +1,6 @@
-import { Config } from './Config'
 // eslint-disable-next-line import/no-named-default
 import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json'
+import { Config } from '.'
 import { LoggerInstance } from '../utils'
 
 const configHelperNetworksBase: Config = {
diff --git a/src/contracts/pools/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts
index b43e5f4b..88fc921b 100644
--- a/src/contracts/pools/FixedRateExchange.ts
+++ b/src/contracts/pools/FixedRateExchange.ts
@@ -13,7 +13,7 @@ import {
   ZERO_ADDRESS
 } from '../../utils'
 import { Config, ConfigHelper } from '../../config'
-import { PriceAndFees } from '../..'
+import { PriceAndFees } from '../../@types'
 
 export interface FixedPriceExchange {
   active: boolean
diff --git a/src/contracts/pools/Pool.ts b/src/contracts/pools/Pool.ts
index 1af63c4a..5f5dd1ee 100644
--- a/src/contracts/pools/Pool.ts
+++ b/src/contracts/pools/Pool.ts
@@ -2,17 +2,22 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import { Contract } from 'web3-eth-contract'
+import Decimal from 'decimal.js'
+import BigNumber from 'bignumber.js'
+import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
+import defaultErc20Abi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 import {
   getFairGasPrice,
   setContractDefaults,
   unitsToAmount,
   amountToUnits,
   LoggerInstance,
-  estimateGas
+  estimateGas,
+  getMaxAddLiquidity,
+  getMaxRemoveLiquidity,
+  getMaxSwapExactIn,
+  getMaxSwapExactOut
 } from '../../utils'
-import BigNumber from 'bignumber.js'
-import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
-import defaultErc20Abi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 import {
   CurrentFees,
   TokenInOutMarket,
@@ -21,13 +26,7 @@ import {
   PoolPriceAndFees
 } from '../../@types'
 import { Config, ConfigHelper } from '../../config'
-import {
-  getMaxAddLiquidity,
-  getMaxRemoveLiquidity,
-  getMaxSwapExactIn,
-  getMaxSwapExactOut
-} from '../../utils/PoolHelpers'
-import Decimal from 'decimal.js'
+
 const MaxUint256 =
   '115792089237316195423570985008687907853269984665640564039457584007913129639934'
 
diff --git a/src/contracts/pools/Router.ts b/src/contracts/pools/Router.ts
index 69972d70..1f4d8ad7 100644
--- a/src/contracts/pools/Router.ts
+++ b/src/contracts/pools/Router.ts
@@ -4,7 +4,7 @@ import { TransactionReceipt } from 'web3-core'
 import { AbiItem } from 'web3-utils'
 import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json'
 import { getFairGasPrice, setContractDefaults, estimateGas } from '../../utils'
-import { Operation } from '../../@types/Router'
+import { Operation } from '../../@types'
 import { Config, ConfigHelper } from '../../config'
 
 /**
diff --git a/src/contracts/pools/SideStaking.ts b/src/contracts/pools/SideStaking.ts
index 60d51c9c..716e3d48 100644
--- a/src/contracts/pools/SideStaking.ts
+++ b/src/contracts/pools/SideStaking.ts
@@ -2,8 +2,8 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import { Contract } from 'web3-eth-contract'
-import { LoggerInstance, getFairGasPrice, estimateGas, unitsToAmount } from '../../utils'
 import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import { LoggerInstance, getFairGasPrice, estimateGas, unitsToAmount } from '../../utils'
 import { Config, ConfigHelper } from '../../config'
 
 export class SideStaking {
diff --git a/src/index.ts b/src/index.ts
index bca55e9b..9959ba57 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,5 @@
 export * from './@types'
-export * from './services'
-export * from './contracts'
 export * from './config'
+export * from './contracts'
+export * from './services'
 export * from './utils'
diff --git a/src/services/Aquarius.ts b/src/services/Aquarius.ts
index 823010c2..b68e2fbd 100644
--- a/src/services/Aquarius.ts
+++ b/src/services/Aquarius.ts
@@ -1,6 +1,7 @@
-import { LoggerInstance, sleep } from '../utils'
-import { Asset, DDO, ValidateMetadata } from '../@types/'
 import fetch from 'cross-fetch'
+import { LoggerInstance, sleep } from '../utils'
+import { Asset, DDO, ValidateMetadata } from '../@types'
+
 export class Aquarius {
   public aquariusURL
   /**
@@ -122,5 +123,3 @@ export class Aquarius {
     return status
   }
 }
-
-export default Aquarius
diff --git a/src/services/Provider.ts b/src/services/Provider.ts
index 2bd87733..602d95c3 100644
--- a/src/services/Provider.ts
+++ b/src/services/Provider.ts
@@ -1,5 +1,6 @@
 import Web3 from 'web3'
-import { LoggerInstance, getData } from '../utils'
+import fetch from 'cross-fetch'
+import { LoggerInstance, getData, noZeroX } from '../utils'
 import {
   FileMetadata,
   ComputeJob,
@@ -9,9 +10,8 @@ import {
   ComputeEnvironment,
   ProviderInitialize,
   ProviderComputeInitializeResults
-} from '../@types/'
-import { noZeroX } from '../utils/ConversionTypeHelper'
-import fetch from 'cross-fetch'
+} from '../@types'
+
 export interface HttpCallback {
   (httpMethod: string, url: string, body: string, header: any): Promise<any>
 }
@@ -780,4 +780,3 @@ export class Provider {
 }
 
 export const ProviderInstance = new Provider()
-export default ProviderInstance
diff --git a/src/utils/ContractUtils.ts b/src/utils/ContractUtils.ts
index 475c1c14..fa6807ae 100644
--- a/src/utils/ContractUtils.ts
+++ b/src/utils/ContractUtils.ts
@@ -1,7 +1,6 @@
 import Web3 from 'web3'
 import BigNumber from 'bignumber.js'
 import { Contract } from 'web3-eth-contract'
-import { generateDtName } from './DatatokenName'
 import {
   Erc20CreateParams,
   FreCreationParams,
@@ -9,9 +8,7 @@ import {
   PoolCreationParams
 } from '../@types'
 import { Config } from '../config'
-import { minAbi } from './minAbi'
-import LoggerInstance from './Logger'
-import { GASLIMIT_DEFAULT, ZERO_ADDRESS } from './Constants'
+import { generateDtName, minAbi, LoggerInstance, GASLIMIT_DEFAULT, ZERO_ADDRESS } from '.'
 
 export function setContractDefaults(contract: Contract, config: Config): Contract {
   if (config) {
diff --git a/src/utils/ConversionTypeHelper.ts b/src/utils/ConversionTypeHelper.ts
index 503256bc..b8141436 100644
--- a/src/utils/ConversionTypeHelper.ts
+++ b/src/utils/ConversionTypeHelper.ts
@@ -1,4 +1,4 @@
-import { LoggerInstance } from './Logger'
+import { LoggerInstance } from '.'
 
 export const zeroX = (input: string): string => zeroXTransformer(input, true)
 export const noZeroX = (input: string): string => zeroXTransformer(input, false)
diff --git a/src/utils/DdoHelpers.ts b/src/utils/DdoHelpers.ts
index a2bb88e4..78bdbadd 100644
--- a/src/utils/DdoHelpers.ts
+++ b/src/utils/DdoHelpers.ts
@@ -1,6 +1,6 @@
 import sha256 from 'crypto-js/sha256'
 import Web3 from 'web3'
-import LoggerInstance from './Logger'
+import { LoggerInstance } from '.'
 
 export function generateDid(erc721Address: string, chainId: number): string {
   erc721Address = Web3.utils.toChecksumAddress(erc721Address)
diff --git a/src/utils/FetchHelper.ts b/src/utils/FetchHelper.ts
index 0fdc5eb5..d40d5f54 100644
--- a/src/utils/FetchHelper.ts
+++ b/src/utils/FetchHelper.ts
@@ -1,6 +1,6 @@
 import fetch from 'cross-fetch'
-import LoggerInstance from './Logger'
-import { DownloadResponse } from '../@types/DownloadResponse'
+import { DownloadResponse } from '../@types'
+import { LoggerInstance } from '.'
 
 export async function fetchData(url: string, opts: RequestInit): Promise<Response> {
   const result = await fetch(url, opts)
diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts
index 7e74c446..a2e480b4 100644
--- a/src/utils/Logger.ts
+++ b/src/utils/Logger.ts
@@ -43,4 +43,3 @@ export class Logger {
 }
 
 export const LoggerInstance = new Logger()
-export default LoggerInstance
diff --git a/src/utils/PoolHelpers.ts b/src/utils/PoolHelpers.ts
index dc93b0a7..b9789308 100644
--- a/src/utils/PoolHelpers.ts
+++ b/src/utils/PoolHelpers.ts
@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js'
-import { Pool } from '..'
+import { Pool } from '../contracts'
 
 export function calcMaxExactOut(balance: string): Decimal {
   return new Decimal(balance).div(2)
diff --git a/src/utils/SignatureUtils.ts b/src/utils/SignatureUtils.ts
index 381f5cc5..3742097c 100644
--- a/src/utils/SignatureUtils.ts
+++ b/src/utils/SignatureUtils.ts
@@ -1,5 +1,4 @@
 import Web3 from 'web3'
-import { LoggerInstance } from './Logger'
 
 export async function signHash(web3: Web3, message: string, address: string) {
   let signedMessage = await web3.eth.sign(message, address)
diff --git a/src/utils/TokenUtils.ts b/src/utils/TokenUtils.ts
index a22a5e0c..bd293946 100644
--- a/src/utils/TokenUtils.ts
+++ b/src/utils/TokenUtils.ts
@@ -1,15 +1,15 @@
 import Decimal from 'decimal.js'
 import { Contract } from 'web3-eth-contract'
+import { TransactionReceipt } from 'web3-core'
+import Web3 from 'web3'
 import {
   amountToUnits,
   estimateGas,
   getFairGasPrice,
-  unitsToAmount
-} from './ContractUtils'
-import { minAbi } from './minAbi'
-import LoggerInstance from './Logger'
-import { TransactionReceipt } from 'web3-core'
-import Web3 from 'web3'
+  unitsToAmount,
+  minAbi,
+  LoggerInstance
+} from '.'
 
 /**
  * Estimate gas cost for approval function
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2ef7951e..2795fcad 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,10 +1,12 @@
-export * from './Logger'
-export * from './DatatokenName'
-export * from './ContractUtils'
-export * from './FetchHelper'
-export * from './DdoHelpers'
 export * from './Constants'
+export * from './ContractUtils'
+export * from './ConversionTypeHelper'
+export * from './DatatokenName'
+export * from './DdoHelpers'
+export * from './FetchHelper'
+export * from './General'
+export * from './Logger'
+export * from './minAbi'
+export * from './PoolHelpers'
 export * from './SignatureUtils'
 export * from './TokenUtils'
-export * from './General'
-export * from './PoolHelpers'