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 {