diff --git a/src/common/components/spinner/index.ts b/src/common/components/spinner/index.ts
index b2a4e980..cd172172 100644
--- a/src/common/components/spinner/index.ts
+++ b/src/common/components/spinner/index.ts
@@ -1 +1 @@
-export { Spinner } from './spinner';
+export * from './spinner';
diff --git a/src/common/helpers/hooks/index.ts b/src/common/helpers/hooks/index.ts
new file mode 100644
index 00000000..c5fd8f6b
--- /dev/null
+++ b/src/common/helpers/hooks/index.ts
@@ -0,0 +1 @@
+export * from './useDebounce';
diff --git a/src/common/helpers/index.ts b/src/common/helpers/index.ts
new file mode 100644
index 00000000..020d4fb2
--- /dev/null
+++ b/src/common/helpers/index.ts
@@ -0,0 +1,3 @@
+export * from './hooks';
+export * from './masa';
+export * from './provider';
diff --git a/src/common/helpers/provider/index.ts b/src/common/helpers/provider/index.ts
new file mode 100644
index 00000000..ac462579
--- /dev/null
+++ b/src/common/helpers/provider/index.ts
@@ -0,0 +1,7 @@
+export * from './masa-context';
+export * from './masa-context-provider';
+export * from './masa-provider';
+export * from './masa-query-client';
+export * from './use-masa';
+export * from './use-metamask';
+export * from './modules';
diff --git a/src/common/index.ts b/src/common/index.ts
new file mode 100644
index 00000000..71080f1d
--- /dev/null
+++ b/src/common/index.ts
@@ -0,0 +1,2 @@
+export * from './components';
+export * from './helpers';
diff --git a/src/index.tsx b/src/index.tsx
index fb668a98..a3a5f016 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,3 +1,2 @@
 export { loadIdentityContracts, addresses } from '@masa-finance/masa-sdk';
-export { MasaProvider } from './common/helpers/provider/masa-provider';
-export { useMasa } from './common/helpers/provider/use-masa';
+export * from './common';
diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx
index c1ef98a0..95183e92 100644
--- a/stories/masa.stories.tsx
+++ b/stories/masa.stories.tsx
@@ -2,7 +2,7 @@
 import React, { useCallback } from 'react';
 import { MasaProvider, useMasa } from '../src';
 import { Meta, Story } from '@storybook/react';
-import { queryClient } from '../src/common/helpers/provider/masa-query-client';
+import { queryClient } from '../src';
 
 const meta: Meta = {
   title: 'SDK Test',