diff --git a/packages/ui-next/api.ts b/packages/ui-next/api.ts
index 763157b3d..fa7071714 100644
--- a/packages/ui-next/api.ts
+++ b/packages/ui-next/api.ts
@@ -1,4 +1,4 @@
 export type { Context } from './src/context';
-export { usePageData } from './src/pageData';
-export type { PageData } from './src/pageData';
+export { usePageData } from './src/context/pageData';
+export type { PageData } from './src/context/pageData';
 export type { ComponentName } from './src/registry';
diff --git a/packages/ui-next/src/App.tsx b/packages/ui-next/src/App.tsx
index 4b2519950..91d87c0a0 100644
--- a/packages/ui-next/src/App.tsx
+++ b/packages/ui-next/src/App.tsx
@@ -1,8 +1,8 @@
-import { usePageData } from './pageData';
+import { usePageData } from './context/pageData';
 import { Component } from './registry';
 
 const AppInner = Component('page:app', () => {
-  const { data } = usePageData();
+  const data = usePageData();
 
   return <div>app, page:{data.name}</div>;
 });
diff --git a/packages/ui-next/src/context.ts b/packages/ui-next/src/context/index.ts
similarity index 92%
rename from packages/ui-next/src/context.ts
rename to packages/ui-next/src/context/index.ts
index eae2b5951..d4d567513 100644
--- a/packages/ui-next/src/context.ts
+++ b/packages/ui-next/src/context/index.ts
@@ -1,6 +1,6 @@
 import {
   after, before, Component, patch,
-} from './registry';
+} from '../registry';
 
 export interface Context {
   before: typeof before;
diff --git a/packages/ui-next/src/pageData.tsx b/packages/ui-next/src/context/pageData.tsx
similarity index 92%
rename from packages/ui-next/src/pageData.tsx
rename to packages/ui-next/src/context/pageData.tsx
index 498a8e3b0..a6727fa31 100644
--- a/packages/ui-next/src/pageData.tsx
+++ b/packages/ui-next/src/context/pageData.tsx
@@ -24,8 +24,8 @@ export function PageDataProvider({ initial, children }: { initial: PageData, chi
 }
 
 // eslint-disable-next-line react-refresh/only-export-components
-export function usePageData(): PageDataContextValue {
+export function usePageData(): PageData {
   const ctx = useContext(PageDataContext);
   if (!ctx) throw new Error('usePageData must be used within PageDataProvider');
-  return ctx;
+  return ctx.data;
 }
diff --git a/packages/ui-next/src/main.tsx b/packages/ui-next/src/main.tsx
index 61912047a..aa194a3f1 100644
--- a/packages/ui-next/src/main.tsx
+++ b/packages/ui-next/src/main.tsx
@@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client';
 import plugins from 'virtual:hydro-plugins';
 import App from './App';
 import { createContext } from './context';
-import { type PageData, PageDataProvider } from './pageData';
+import { type PageData, PageDataProvider } from './context/pageData';
 
 const ctx = createContext();
 for (const plugin of plugins) {
diff --git a/packages/ui-next/src/registry.tsx b/packages/ui-next/src/registry/index.tsx
similarity index 100%
rename from packages/ui-next/src/registry.tsx
rename to packages/ui-next/src/registry/index.tsx