diff --git a/apps/docs/app/api/code-storage/github/callback/route.ts b/apps/docs/app/api/code-storage/github/callback/route.ts
index 1e48c085b..48b690c0b 100644
--- a/apps/docs/app/api/code-storage/github/callback/route.ts
+++ b/apps/docs/app/api/code-storage/github/callback/route.ts
@@ -1,4 +1,4 @@
-import { CodeStorageSuccessCallback } from '@pierre/storage-elements/next';
+import { CodeStorageSuccessCallback } from '@pierre/storage-elements-next';
 import { type NextRequest } from 'next/server';
 
 const successCallback = new CodeStorageSuccessCallback({
diff --git a/apps/docs/package.json b/apps/docs/package.json
index cff29a3de..d9405bac3 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@pierre/diff-ui": "workspace:*",
     "@pierre/storage": "catalog:",
-    "@pierre/storage-elements": "workspace:*",
+    "@pierre/storage-elements-next": "workspace:*",
     "@radix-ui/react-avatar": "catalog:",
     "@radix-ui/react-dialog": "catalog:",
     "@radix-ui/react-dropdown-menu": "catalog:",
diff --git a/apps/docs/registry/new-york/blocks/git-platform-sync b/apps/docs/registry/new-york/blocks/git-platform-sync
index dcd55d513..edc1ad223 120000
--- a/apps/docs/registry/new-york/blocks/git-platform-sync
+++ b/apps/docs/registry/new-york/blocks/git-platform-sync
@@ -1 +1 @@
-../../../../../packages/storage-elements/shadcn/blocks/git-platform-sync
\ No newline at end of file
+../../../../../packages/storage-elements/blocks/git-platform-sync
\ No newline at end of file
diff --git a/bun.lock b/bun.lock
index e575aaa17..f24fdbf54 100644
--- a/bun.lock
+++ b/bun.lock
@@ -41,7 +41,7 @@
       "dependencies": {
         "@pierre/diff-ui": "workspace:*",
         "@pierre/storage": "catalog:",
-        "@pierre/storage-elements": "workspace:*",
+        "@pierre/storage-elements-next": "workspace:*",
         "@radix-ui/react-avatar": "catalog:",
         "@radix-ui/react-dialog": "catalog:",
         "@radix-ui/react-dropdown-menu": "catalog:",
@@ -114,7 +114,7 @@
     },
     "packages/storage-elements": {
       "name": "@pierre/storage-elements",
-      "version": "0.0.0",
+      "version": "0.0.2",
       "dependencies": {
         "@radix-ui/react-dialog": "catalog:",
         "@radix-ui/react-label": "catalog:",
@@ -132,11 +132,18 @@
         "tailwind-merge": "catalog:",
       },
       "devDependencies": {
-        "@octokit/openapi-types": "catalog:",
         "@types/react": "catalog:",
         "@types/react-dom": "catalog:",
         "typescript": "catalog:",
       },
+    },
+    "packages/storage-elements-next": {
+      "name": "@pierre/storage-elements-next",
+      "version": "0.0.2",
+      "devDependencies": {
+        "@octokit/openapi-types": "catalog:",
+        "typescript": ">=5",
+      },
       "peerDependencies": {
         "next": ">=15",
       },
@@ -153,7 +160,7 @@
     "@next/eslint-plugin-next": "15.5.5",
     "@octokit/app": "16.1.1",
     "@octokit/auth-app": "8.1.1",
-    "@octokit/openapi-types": "26.0.0",
+    "@octokit/openapi-types": "^26.0.0",
     "@octokit/rest": "22.0.0",
     "@pierre/storage": "0.0.10",
     "@radix-ui/react-avatar": "1.1.10",
@@ -518,6 +525,8 @@
 
     "@pierre/storage-elements": ["@pierre/storage-elements@workspace:packages/storage-elements"],
 
+    "@pierre/storage-elements-next": ["@pierre/storage-elements-next@workspace:packages/storage-elements-next"],
+
     "@radix-ui/number": ["@radix-ui/number@1.1.1", "", {}, "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g=="],
 
     "@radix-ui/primitive": ["@radix-ui/primitive@1.1.3", "", {}, "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg=="],
diff --git a/package.json b/package.json
index 20704855e..d67a48614 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
       "@next/eslint-plugin-next": "15.5.5",
       "@octokit/app": "16.1.1",
       "@octokit/auth-app": "8.1.1",
-      "@octokit/openapi-types": "26.0.0",
+      "@octokit/openapi-types": "^26.0.0",
       "@octokit/rest": "22.0.0",
       "@pierre/storage": "0.0.10",
       "@radix-ui/react-avatar": "1.1.10",
diff --git a/packages/storage-elements-next/package.json b/packages/storage-elements-next/package.json
new file mode 100644
index 000000000..3d8cafaa6
--- /dev/null
+++ b/packages/storage-elements-next/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@pierre/storage-elements-next",
+  "version": "0.0.2",
+  "type": "module",
+  "scripts": {
+    "tsc": "tsc --build",
+    "build": "tsc --build"
+  },
+  "exports": {
+    ".": {
+      "import": "./src/index.ts"
+    }
+  },
+  "files": [
+    "src"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {},
+  "peerDependencies": {
+    "next": ">=15"
+  },
+  "devDependencies": {
+    "@octokit/openapi-types": "catalog:",
+    "typescript": ">=5"
+  }
+}
diff --git a/packages/storage-elements/next/auth/success-callback.ts b/packages/storage-elements-next/src/auth/success-callback.ts
similarity index 100%
rename from packages/storage-elements/next/auth/success-callback.ts
rename to packages/storage-elements-next/src/auth/success-callback.ts
diff --git a/packages/storage-elements/next/index.ts b/packages/storage-elements-next/src/index.ts
similarity index 100%
rename from packages/storage-elements/next/index.ts
rename to packages/storage-elements-next/src/index.ts
diff --git a/packages/storage-elements-next/tsconfig.json b/packages/storage-elements-next/tsconfig.json
new file mode 100644
index 000000000..c591052ce
--- /dev/null
+++ b/packages/storage-elements-next/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.options.json",
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "noEmit": true,
+    "lib": ["ES2020"],
+    "baseUrl": "."
+  }
+}
diff --git a/packages/storage-elements/shadcn/blocks/git-platform-sync/combobox.tsx b/packages/storage-elements/blocks/git-platform-sync/combobox.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/blocks/git-platform-sync/combobox.tsx
rename to packages/storage-elements/blocks/git-platform-sync/combobox.tsx
diff --git a/packages/storage-elements/shadcn/blocks/git-platform-sync/git-platform-sync.tsx b/packages/storage-elements/blocks/git-platform-sync/git-platform-sync.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/blocks/git-platform-sync/git-platform-sync.tsx
rename to packages/storage-elements/blocks/git-platform-sync/git-platform-sync.tsx
diff --git a/packages/storage-elements/shadcn/blocks/git-platform-sync/github/github-app-connect.ts b/packages/storage-elements/blocks/git-platform-sync/github/github-app-connect.ts
similarity index 100%
rename from packages/storage-elements/shadcn/blocks/git-platform-sync/github/github-app-connect.ts
rename to packages/storage-elements/blocks/git-platform-sync/github/github-app-connect.ts
diff --git a/packages/storage-elements/shadcn/blocks/git-platform-sync/github/icon.tsx b/packages/storage-elements/blocks/git-platform-sync/github/icon.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/blocks/git-platform-sync/github/icon.tsx
rename to packages/storage-elements/blocks/git-platform-sync/github/icon.tsx
diff --git a/packages/storage-elements/shadcn/blocks/git-platform-sync/github/owners.ts b/packages/storage-elements/blocks/git-platform-sync/github/owners.ts
similarity index 100%
rename from packages/storage-elements/shadcn/blocks/git-platform-sync/github/owners.ts
rename to packages/storage-elements/blocks/git-platform-sync/github/owners.ts
diff --git a/packages/storage-elements/shadcn/components/ui/button.tsx b/packages/storage-elements/components/ui/button.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/button.tsx
rename to packages/storage-elements/components/ui/button.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/command.tsx b/packages/storage-elements/components/ui/command.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/command.tsx
rename to packages/storage-elements/components/ui/command.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/dialog.tsx b/packages/storage-elements/components/ui/dialog.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/dialog.tsx
rename to packages/storage-elements/components/ui/dialog.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/field.tsx b/packages/storage-elements/components/ui/field.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/field.tsx
rename to packages/storage-elements/components/ui/field.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/input.tsx b/packages/storage-elements/components/ui/input.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/input.tsx
rename to packages/storage-elements/components/ui/input.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/label.tsx b/packages/storage-elements/components/ui/label.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/label.tsx
rename to packages/storage-elements/components/ui/label.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/popover.tsx b/packages/storage-elements/components/ui/popover.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/popover.tsx
rename to packages/storage-elements/components/ui/popover.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/select.tsx b/packages/storage-elements/components/ui/select.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/select.tsx
rename to packages/storage-elements/components/ui/select.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/separator.tsx b/packages/storage-elements/components/ui/separator.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/separator.tsx
rename to packages/storage-elements/components/ui/separator.tsx
diff --git a/packages/storage-elements/shadcn/components/ui/tooltip.tsx b/packages/storage-elements/components/ui/tooltip.tsx
similarity index 100%
rename from packages/storage-elements/shadcn/components/ui/tooltip.tsx
rename to packages/storage-elements/components/ui/tooltip.tsx
diff --git a/packages/storage-elements/shadcn/lib/utils.ts b/packages/storage-elements/lib/utils.ts
similarity index 100%
rename from packages/storage-elements/shadcn/lib/utils.ts
rename to packages/storage-elements/lib/utils.ts
diff --git a/packages/storage-elements/package.json b/packages/storage-elements/package.json
index 1a160a399..d962e4519 100644
--- a/packages/storage-elements/package.json
+++ b/packages/storage-elements/package.json
@@ -1,17 +1,11 @@
 {
   "name": "@pierre/storage-elements",
-  "private": true,
-  "version": "0.0.0",
+  "version": "0.0.2",
   "type": "module",
   "scripts": {
     "tsc": "tsc --build",
     "build": "tsc --build"
   },
-  "exports": {
-    "./next": {
-      "import": "./next/index.ts"
-    }
-  },
   "dependencies": {
     "@radix-ui/react-dialog": "catalog:",
     "@radix-ui/react-label": "catalog:",
@@ -28,11 +22,7 @@
     "react-dom": "catalog:",
     "tailwind-merge": "catalog:"
   },
-  "peerDependencies": {
-    "next": ">=15"
-  },
   "devDependencies": {
-    "@octokit/openapi-types": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "typescript": "catalog:"
diff --git a/packages/storage-elements/tsconfig.json b/packages/storage-elements/tsconfig.json
index e06d3100c..b225845cd 100644
--- a/packages/storage-elements/tsconfig.json
+++ b/packages/storage-elements/tsconfig.json
@@ -1,18 +1,13 @@
 {
   "extends": "../../tsconfig.options.json",
-  "include": [
-    "shadcn/blocks/**/*",
-    "shadcn/components/**/*",
-    "shadcn/lib/**/*",
-    "next/**/*"
-  ],
+  "include": ["blocks/**/*", "components/**/*", "lib/**/*"],
   "compilerOptions": {
     "noEmit": true,
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "baseUrl": ".",
     "paths": {
-      "@/registry/new-york/*": ["./shadcn/*"],
-      "@/*": ["./shadcn/*"]
+      "@/registry/new-york/*": ["./*"],
+      "@/*": ["./*"]
     }
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 1c5039fda..461effe2a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,9 @@
     },
     {
       "path": "packages/storage-elements"
+    },
+    {
+      "path": "packages/storage-elements-next"
     }
   ]
 }