diff --git a/examples/react/ui/src/ContentPage.js b/examples/react/ui/src/ContentPage.js
index d9fc6368..9b0eb279 100644
--- a/examples/react/ui/src/ContentPage.js
+++ b/examples/react/ui/src/ContentPage.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import { Uploader, SimpleUploader } from '@w3ui/react-ui'
-import { UploaderProvider, useUploader } from '@w3ui/react-uploader'
+import { SimpleUploader } from '@w3ui/react-ui'
+import { Uploader, UploaderProvider, useUploader } from '@w3ui/react-uploader'
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
 import { a11yDark } from 'react-syntax-highlighter/dist/esm/styles/prism';
 
diff --git a/packages/react-ui/src/SimpleUploader.tsx b/packages/react-ui/src/SimpleUploader.tsx
index 698e543c..d62bd9b4 100644
--- a/packages/react-ui/src/SimpleUploader.tsx
+++ b/packages/react-ui/src/SimpleUploader.tsx
@@ -1,8 +1,8 @@
 import React, { useContext } from 'react'
 import { CARMetadata } from '@w3ui/uploader-core'
+import Uploader, { UploaderContext } from '@w3ui/react-uploader';
 import { Link, Version } from 'multiformats'
 
-import Uploader, { UploaderContext } from './Uploader';
 
 export const Uploading = ({ file, storedDAGShards }: { file?: File, storedDAGShards?: CARMetadata[] }) => (
   <div className="uploading">
diff --git a/packages/react-ui/src/index.ts b/packages/react-ui/src/index.ts
index 4dbe3c95..e900e50e 100644
--- a/packages/react-ui/src/index.ts
+++ b/packages/react-ui/src/index.ts
@@ -1,2 +1 @@
-export * from './Uploader'
 export * from './SimpleUploader'
diff --git a/packages/react-ui/src/Uploader.tsx b/packages/react-uploader/src/Uploader.tsx
similarity index 89%
rename from packages/react-ui/src/Uploader.tsx
rename to packages/react-uploader/src/Uploader.tsx
index 7a312ae6..3406c5d8 100644
--- a/packages/react-ui/src/Uploader.tsx
+++ b/packages/react-uploader/src/Uploader.tsx
@@ -1,6 +1,7 @@
 import React, { useContext, createContext, useState } from 'react'
-import { useUploader, CARMetadata } from '@w3ui/react-uploader'
 import { Link, Version } from 'multiformats'
+import { CARMetadata } from '@w3ui/uploader-core'
+import { useUploader } from './providers/Uploader'
 
 export type UploaderContextValue = {
   storedDAGShards?: CARMetadata[],
@@ -14,7 +15,7 @@ export type UploaderContextValue = {
 }
 
 export const UploaderContext = createContext<UploaderContextValue>({
-  setFile: () => {}
+  setFile: () => { }
 })
 
 export type UploaderProps = {
@@ -59,7 +60,7 @@ Uploader.Input = (props: any) => {
   )
 }
 
-Uploader.Form = ({ children, ...props }: {children: React.ReactNode} & any) => {
+Uploader.Form = ({ children, ...props }: { children: React.ReactNode } & any) => {
   const { handleUploadSubmit } = useContext(UploaderContext)
   return (
     <form onSubmit={handleUploadSubmit} {...props}>
diff --git a/packages/react-uploader/src/index.ts b/packages/react-uploader/src/index.ts
index 4a5053a5..e6982bbc 100644
--- a/packages/react-uploader/src/index.ts
+++ b/packages/react-uploader/src/index.ts
@@ -1,2 +1,3 @@
 export { uploadFile, uploadDirectory, Service, CARMetadata } from '@w3ui/uploader-core'
 export * from './providers/Uploader'
+export * from './Uploader'