diff --git a/packages/massa-web3/src/experimental/client/index.ts b/packages/massa-web3/src/experimental/client/index.ts
index 83dae763..23747af0 100644
--- a/packages/massa-web3/src/experimental/client/index.ts
+++ b/packages/massa-web3/src/experimental/client/index.ts
@@ -1 +1,3 @@
-export * from './client'
+export * from './interfaces'
+export * from './jsonRPCClient'
+export * from './publicAPI'
diff --git a/packages/massa-web3/src/experimental/client/client.ts b/packages/massa-web3/src/experimental/client/interfaces.ts
similarity index 100%
rename from packages/massa-web3/src/experimental/client/client.ts
rename to packages/massa-web3/src/experimental/client/interfaces.ts
diff --git a/packages/massa-web3/src/experimental/jsonRPCClient.ts b/packages/massa-web3/src/experimental/client/jsonRPCClient.ts
similarity index 100%
rename from packages/massa-web3/src/experimental/jsonRPCClient.ts
rename to packages/massa-web3/src/experimental/client/jsonRPCClient.ts
diff --git a/packages/massa-web3/src/experimental/publicAPI.ts b/packages/massa-web3/src/experimental/client/publicAPI.ts
similarity index 97%
rename from packages/massa-web3/src/experimental/publicAPI.ts
rename to packages/massa-web3/src/experimental/client/publicAPI.ts
index 741b19a0..cd33444a 100644
--- a/packages/massa-web3/src/experimental/publicAPI.ts
+++ b/packages/massa-web3/src/experimental/client/publicAPI.ts
@@ -1,5 +1,5 @@
-import { OperationStatus } from './basicElements'
-import { SendOperationInput, EventFilter as EvtFilter } from './client'
+import { OperationStatus } from '../basicElements'
+import { SendOperationInput, EventFilter as EvtFilter } from '.'
 import {
   OperationInput,
   Pagination,
@@ -25,8 +25,8 @@ import {
   Staker,
   OperationId,
   AddressFilter,
-} from './generated/client'
-import { toNanoMas } from './utils'
+} from '../generated/client'
+import { toNanoMas } from '../utils'
 
 export enum Transport {
   webSocket = 'websocket',
diff --git a/packages/massa-web3/test/experimental/unit/Address.spec.ts b/packages/massa-web3/test/experimental/unit/address.spec.ts
similarity index 100%
rename from packages/massa-web3/test/experimental/unit/Address.spec.ts
rename to packages/massa-web3/test/experimental/unit/address.spec.ts