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 04715fd1..7112c04e 100644
--- a/src/factories/NFTFactory.ts
+++ b/src/contracts/factories/NFTFactory.ts
@@ -14,8 +14,8 @@ import {
   estimateGas,
   ZERO_ADDRESS,
   ConfigHelper
-} from '../utils'
-import { Config } from '../config/index.js'
+} from '../../utils'
+import { Config } from '../../config'
 import {
   ProviderFees,
   FreCreationParams,
@@ -23,7 +23,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 1ee21e6c..ac01d8e7 100644
--- a/src/pools/dispenser/Dispenser.ts
+++ b/src/contracts/pools/Dispenser.ts
@@ -11,7 +11,7 @@ import {
   estimateGas,
   ConfigHelper
 } from '../../utils/'
-import { Datatoken } from '../../tokens'
+import { Datatoken } from '..'
 import { Config } from '../../config/index.js'
 
 export interface DispenserToken {
diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts
similarity index 100%
rename from src/pools/fixedRate/FixedRateExchange.ts
rename to src/contracts/pools/FixedRateExchange.ts
diff --git a/src/pools/balancer/Pool.ts b/src/contracts/pools/Pool.ts
similarity index 100%
rename from src/pools/balancer/Pool.ts
rename to src/contracts/pools/Pool.ts
diff --git a/src/pools/Router.ts b/src/contracts/pools/Router.ts
similarity index 98%
rename from src/pools/Router.ts
rename to src/contracts/pools/Router.ts
index a206a2ae..40b3a226 100644
--- a/src/pools/Router.ts
+++ b/src/contracts/pools/Router.ts
@@ -3,9 +3,14 @@ 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 '../config/index.js'
+import {
+  getFairGasPrice,
+  setContractDefaults,
+  ConfigHelper,
+  estimateGas
+} from '../../utils'
+import { Operation } from '../../@types/Router'
+import { Config } from '../../config/index.js'
 
 /**
  * Provides an interface for FactoryRouter contract
diff --git a/src/pools/ssContracts/SideStaking.ts b/src/contracts/pools/SideStaking.ts
similarity index 100%
rename from src/pools/ssContracts/SideStaking.ts
rename to src/contracts/pools/SideStaking.ts
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 cfc3de33..9ecd2530 100644
--- a/src/tokens/Datatoken.ts
+++ b/src/contracts/tokens/Datatoken.ts
@@ -13,16 +13,16 @@ import {
   estimateGas,
   ZERO_ADDRESS,
   ConfigHelper
-} from '../utils'
+} from '../../utils'
 import {
   ConsumeMarketFee,
   FreOrderParams,
   FreCreationParams,
   ProviderFees,
   PublishingMarketFee
-} from '../@types'
+} from '../../@types'
 import { Nft } from './NFT'
-import { Config } from '../config/index.js'
+import { Config } 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 7bad7ac4..b5b07018 100644
--- a/src/tokens/NFT.ts
+++ b/src/contracts/tokens/NFT.ts
@@ -9,11 +9,10 @@ import {
   setContractDefaults,
   estimateGas,
   ConfigHelper
-} from '../utils'
+} from '../../utils'
 import { Contract } from 'web3-eth-contract'
-import { MetadataProof } from '../../src/@types'
-import { Config } from '../config/index.js'
-import { MetadataAndTokenURI } from '../@types'
+import { MetadataProof, MetadataAndTokenURI } from '../../@types'
+import { Config } 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 4c3f1cd7..bca55e9b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,5 @@
 export * from './@types'
 export * from './services'
-export * from './pools'
-export * from './tokens'
-export * from './factories'
+export * from './contracts'
 export * from './config'
 export * from './utils'
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/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'