diff --git a/src/models/Config.ts b/src/config/Config.ts
similarity index 100%
rename from src/models/Config.ts
rename to src/config/Config.ts
diff --git a/src/utils/ConfigHelper.ts b/src/config/ConfigHelper.ts
similarity index 98%
rename from src/utils/ConfigHelper.ts
rename to src/config/ConfigHelper.ts
index cc01d00c..bbe0adda 100644
--- a/src/utils/ConfigHelper.ts
+++ b/src/config/ConfigHelper.ts
@@ -1,7 +1,7 @@
-import Config from '../models/Config'
+import { Config } from './Config'
 // eslint-disable-next-line import/no-named-default
 import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json'
-import LoggerInstance from './Logger'
+import { LoggerInstance } from '../utils'
 
 const configHelperNetworksBase: Config = {
   chainId: null,
diff --git a/src/config/index.ts b/src/config/index.ts
new file mode 100644
index 00000000..3ac42305
--- /dev/null
+++ b/src/config/index.ts
@@ -0,0 +1,2 @@
+export * from './Config'
+export * from './ConfigHelper'
diff --git a/src/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts
similarity index 99%
rename from src/factories/NFTFactory.ts
rename to src/contracts/factories/NFTFactory.ts
index 9b697282..cca80872 100644
--- a/src/factories/NFTFactory.ts
+++ b/src/contracts/factories/NFTFactory.ts
@@ -12,10 +12,9 @@ import {
   getPoolCreationParams,
   setContractDefaults,
   estimateGas,
-  ZERO_ADDRESS,
-  ConfigHelper
-} from '../utils'
-import { Config } from '../models/index.js'
+  ZERO_ADDRESS
+} from '../../utils'
+import { Config, ConfigHelper } from '../../config'
 import {
   ProviderFees,
   FreCreationParams,
@@ -23,7 +22,7 @@ import {
   PoolCreationParams,
   DispenserCreationParams,
   ConsumeMarketFee
-} from '../@types/index.js'
+} from '../../@types'
 
 interface Template {
   templateAddress: string
diff --git a/src/contracts/index.ts b/src/contracts/index.ts
new file mode 100644
index 00000000..bef542cb
--- /dev/null
+++ b/src/contracts/index.ts
@@ -0,0 +1,8 @@
+export * from './factories/NFTFactory'
+export * from './pools/Dispenser'
+export * from './pools/FixedRateExchange'
+export * from './pools/Pool'
+export * from './pools/Router'
+export * from './pools/SideStaking'
+export * from './tokens/Datatoken'
+export * from './tokens/NFT'
diff --git a/src/pools/dispenser/Dispenser.ts b/src/contracts/pools/Dispenser.ts
similarity index 99%
rename from src/pools/dispenser/Dispenser.ts
rename to src/contracts/pools/Dispenser.ts
index c26e0ea4..d50a0668 100644
--- a/src/pools/dispenser/Dispenser.ts
+++ b/src/contracts/pools/Dispenser.ts
@@ -8,11 +8,10 @@ import {
   LoggerInstance as logger,
   getFairGasPrice,
   setContractDefaults,
-  estimateGas,
-  ConfigHelper
+  estimateGas
 } from '../../utils/'
-import { Datatoken } from '../../tokens'
-import { Config } from '../../models/index.js'
+import { Datatoken } from '..'
+import { Config, ConfigHelper } from '../../config'
 
 export interface DispenserToken {
   active: boolean
diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts
similarity index 99%
rename from src/pools/fixedRate/FixedRateExchange.ts
rename to src/contracts/pools/FixedRateExchange.ts
index ca3e5bd9..b43e5f4b 100644
--- a/src/pools/fixedRate/FixedRateExchange.ts
+++ b/src/contracts/pools/FixedRateExchange.ts
@@ -10,10 +10,9 @@ import {
   amountToUnits,
   unitsToAmount,
   estimateGas,
-  ZERO_ADDRESS,
-  ConfigHelper
+  ZERO_ADDRESS
 } from '../../utils'
-import { Config } from '../../models/index.js'
+import { Config, ConfigHelper } from '../../config'
 import { PriceAndFees } from '../..'
 
 export interface FixedPriceExchange {
diff --git a/src/pools/balancer/Pool.ts b/src/contracts/pools/Pool.ts
similarity index 99%
rename from src/pools/balancer/Pool.ts
rename to src/contracts/pools/Pool.ts
index 95096265..1af63c4a 100644
--- a/src/pools/balancer/Pool.ts
+++ b/src/contracts/pools/Pool.ts
@@ -8,8 +8,7 @@ import {
   unitsToAmount,
   amountToUnits,
   LoggerInstance,
-  estimateGas,
-  ConfigHelper
+  estimateGas
 } from '../../utils'
 import BigNumber from 'bignumber.js'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
@@ -21,7 +20,7 @@ import {
   AmountsOutMaxFee,
   PoolPriceAndFees
 } from '../../@types'
-import { Config } from '../../models'
+import { Config, ConfigHelper } from '../../config'
 import {
   getMaxAddLiquidity,
   getMaxRemoveLiquidity,
diff --git a/src/pools/Router.ts b/src/contracts/pools/Router.ts
similarity index 99%
rename from src/pools/Router.ts
rename to src/contracts/pools/Router.ts
index 25567847..69972d70 100644
--- a/src/pools/Router.ts
+++ b/src/contracts/pools/Router.ts
@@ -3,9 +3,9 @@ import Web3 from 'web3'
 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, ConfigHelper, estimateGas } from '../utils'
-import { Operation } from '../@types/Router'
-import { Config } from '../models/index.js'
+import { getFairGasPrice, setContractDefaults, estimateGas } from '../../utils'
+import { Operation } from '../../@types/Router'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * Provides an interface for FactoryRouter contract
diff --git a/src/pools/ssContracts/SideStaking.ts b/src/contracts/pools/SideStaking.ts
similarity index 98%
rename from src/pools/ssContracts/SideStaking.ts
rename to src/contracts/pools/SideStaking.ts
index 154ea1a5..60d51c9c 100644
--- a/src/pools/ssContracts/SideStaking.ts
+++ b/src/contracts/pools/SideStaking.ts
@@ -2,15 +2,9 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import { Contract } from 'web3-eth-contract'
-import {
-  LoggerInstance,
-  getFairGasPrice,
-  ConfigHelper,
-  estimateGas,
-  unitsToAmount
-} from '../../utils'
+import { LoggerInstance, getFairGasPrice, estimateGas, unitsToAmount } from '../../utils'
 import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import { Config } from '../../models'
+import { Config, ConfigHelper } from '../../config'
 
 export class SideStaking {
   public ssAbi: AbiItem | AbiItem[]
diff --git a/src/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts
similarity index 99%
rename from src/tokens/Datatoken.ts
rename to src/contracts/tokens/Datatoken.ts
index 5c155d5d..21912fb5 100644
--- a/src/tokens/Datatoken.ts
+++ b/src/contracts/tokens/Datatoken.ts
@@ -11,18 +11,17 @@ import {
   setContractDefaults,
   getFreOrderParams,
   estimateGas,
-  ZERO_ADDRESS,
-  ConfigHelper
-} from '../utils'
+  ZERO_ADDRESS
+} from '../../utils'
 import {
   ConsumeMarketFee,
   FreOrderParams,
   FreCreationParams,
   ProviderFees,
   PublishingMarketFee
-} from '../@types'
+} from '../../@types'
 import { Nft } from './NFT'
-import { Config } from '../models/index.js'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * ERC20 ROLES
diff --git a/src/tokens/NFT.ts b/src/contracts/tokens/NFT.ts
similarity index 99%
rename from src/tokens/NFT.ts
rename to src/contracts/tokens/NFT.ts
index 7fd2b4b1..202d9f51 100644
--- a/src/tokens/NFT.ts
+++ b/src/contracts/tokens/NFT.ts
@@ -7,13 +7,11 @@ import {
   getFairGasPrice,
   generateDtName,
   setContractDefaults,
-  estimateGas,
-  ConfigHelper
-} from '../utils'
+  estimateGas
+} from '../../utils'
 import { Contract } from 'web3-eth-contract'
-import { MetadataProof } from '../../src/@types'
-import { Config } from '../models/index.js'
-import { MetadataAndTokenURI } from '../@types'
+import { MetadataProof, MetadataAndTokenURI } from '../../@types'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * ERC721 ROLES
diff --git a/src/factories/index.ts b/src/factories/index.ts
deleted file mode 100644
index 17b42cb9..00000000
--- a/src/factories/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './NFTFactory'
diff --git a/src/index.ts b/src/index.ts
index 5447a5f4..bca55e9b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,8 +1,5 @@
-export * from './aquarius'
-export * from './pools'
-export * from './tokens'
-export * from './factories'
-export * from './models'
-export * from './utils'
 export * from './@types'
-export * from './provider'
+export * from './services'
+export * from './contracts'
+export * from './config'
+export * from './utils'
diff --git a/src/models/index.ts b/src/models/index.ts
deleted file mode 100644
index a871693a..00000000
--- a/src/models/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Config'
diff --git a/src/pools/balancer/index.ts b/src/pools/balancer/index.ts
deleted file mode 100644
index 0d56f727..00000000
--- a/src/pools/balancer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Pool'
diff --git a/src/pools/dispenser/index.ts b/src/pools/dispenser/index.ts
deleted file mode 100644
index e6284e41..00000000
--- a/src/pools/dispenser/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Dispenser'
diff --git a/src/pools/fixedRate/index.ts b/src/pools/fixedRate/index.ts
deleted file mode 100644
index 88b1dccc..00000000
--- a/src/pools/fixedRate/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './FixedRateExchange'
diff --git a/src/pools/index.ts b/src/pools/index.ts
deleted file mode 100644
index 378520db..00000000
--- a/src/pools/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './balancer'
-export * from './dispenser'
-export * from './fixedRate'
-export * from './ssContracts'
-export * from './Router'
diff --git a/src/pools/ssContracts/index.ts b/src/pools/ssContracts/index.ts
deleted file mode 100644
index 8ade0ddb..00000000
--- a/src/pools/ssContracts/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './SideStaking'
diff --git a/src/provider/index.ts b/src/provider/index.ts
deleted file mode 100644
index 0ce7b023..00000000
--- a/src/provider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Provider'
diff --git a/src/aquarius/Aquarius.ts b/src/services/Aquarius.ts
similarity index 100%
rename from src/aquarius/Aquarius.ts
rename to src/services/Aquarius.ts
diff --git a/src/provider/Provider.ts b/src/services/Provider.ts
similarity index 100%
rename from src/provider/Provider.ts
rename to src/services/Provider.ts
diff --git a/src/aquarius/index.ts b/src/services/index.ts
similarity index 50%
rename from src/aquarius/index.ts
rename to src/services/index.ts
index da423a41..7ad71555 100644
--- a/src/aquarius/index.ts
+++ b/src/services/index.ts
@@ -1 +1,2 @@
 export * from './Aquarius'
+export * from './Provider'
diff --git a/src/tokens/index.ts b/src/tokens/index.ts
deleted file mode 100644
index 5e47c88e..00000000
--- a/src/tokens/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './Datatoken'
-export * from './NFT'
diff --git a/src/utils/ContractUtils.ts b/src/utils/ContractUtils.ts
index 94012c76..475c1c14 100644
--- a/src/utils/ContractUtils.ts
+++ b/src/utils/ContractUtils.ts
@@ -8,7 +8,7 @@ import {
   FreOrderParams,
   PoolCreationParams
 } from '../@types'
-import { Config } from '../models'
+import { Config } from '../config'
 import { minAbi } from './minAbi'
 import LoggerInstance from './Logger'
 import { GASLIMIT_DEFAULT, ZERO_ADDRESS } from './Constants'
diff --git a/src/utils/DatatokenName.ts b/src/utils/DatatokenName.ts
index 31d3ceec..af4ef4a1 100644
--- a/src/utils/DatatokenName.ts
+++ b/src/utils/DatatokenName.ts
@@ -1,4 +1,4 @@
-import wordListDefault from '../data/words.json'
+import wordListDefault from './data/words.json'
 
 /**
  * Generate new datatoken name & symbol from a word list
diff --git a/src/data/words.json b/src/utils/data/words.json
similarity index 100%
rename from src/data/words.json
rename to src/utils/data/words.json
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 7085dbc0..2ef7951e 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -2,7 +2,6 @@ export * from './Logger'
 export * from './DatatokenName'
 export * from './ContractUtils'
 export * from './FetchHelper'
-export * from './ConfigHelper'
 export * from './DdoHelpers'
 export * from './Constants'
 export * from './SignatureUtils'
diff --git a/test/config.ts b/test/config.ts
index f86adce1..19519b18 100644
--- a/test/config.ts
+++ b/test/config.ts
@@ -1,12 +1,8 @@
 import Web3 from 'web3'
 import fs from 'fs'
 import { homedir } from 'os'
-import {
-  ConfigHelper,
-  configHelperNetworks,
-  LoggerInstance,
-  LogLevel
-} from '../src/utils'
+import { ConfigHelper, configHelperNetworks } from '../src/config'
+import { LoggerInstance, LogLevel } from '../src/utils'
 
 LoggerInstance.setLevel(LogLevel.Error)