diff --git a/renderer/+config.h.ts b/renderer/+config.h.ts
new file mode 100644
index 0000000..c582c5a
--- /dev/null
+++ b/renderer/+config.h.ts
@@ -0,0 +1,6 @@
+// See https://vike.dev/data-fetching
+export default {
+  clientRouting: true,
+  prefetchStaticAssets: 'viewport',
+  passToClient: ['pageProps', /* 'urlPathname', */ 'routeParams']
+}
\ No newline at end of file
diff --git a/renderer/+onHydrationEnd.ts b/renderer/+onHydrationEnd.ts
new file mode 100644
index 0000000..7106a98
--- /dev/null
+++ b/renderer/+onHydrationEnd.ts
@@ -0,0 +1,5 @@
+function onHydrationEnd() {
+  // console.log('Hydration finished; page is now interactive.')
+}
+
+export { onHydrationEnd }
\ No newline at end of file
diff --git a/renderer/+onPageTransitionEnd.ts b/renderer/+onPageTransitionEnd.ts
new file mode 100644
index 0000000..d626bc7
--- /dev/null
+++ b/renderer/+onPageTransitionEnd.ts
@@ -0,0 +1,6 @@
+function onPageTransitionEnd() {
+  // console.log('Page transition end')
+  // document.body.classList.remove('page-transition')
+}
+
+export { onPageTransitionEnd }
\ No newline at end of file
diff --git a/renderer/+onPageTransitionStart.ts b/renderer/+onPageTransitionStart.ts
new file mode 100644
index 0000000..2e52e99
--- /dev/null
+++ b/renderer/+onPageTransitionStart.ts
@@ -0,0 +1,6 @@
+function onPageTransitionStart() {
+  // console.log('Page transition start')
+  // document.body.classList.add('page-transition')
+}
+  
+export { onPageTransitionStart }
\ No newline at end of file
diff --git a/renderer/+onRenderClient.ts b/renderer/+onRenderClient.ts
new file mode 100644
index 0000000..825c8c1
--- /dev/null
+++ b/renderer/+onRenderClient.ts
@@ -0,0 +1,15 @@
+import { createApp } from './app'
+
+import type { PageContext, VikePageContext } from '#types/PageContext'
+
+let instance: ReturnType<typeof createApp>
+/* async */ function render(pageContext: VikePageContext & PageContext) {
+  if (!instance) {
+    instance = createApp(pageContext)
+    instance.app.mount('#app')
+  } else {
+    instance.app.changePage(pageContext)
+  }
+}
+
+export default render
diff --git a/renderer/_default.page.server.ts b/renderer/+onRenderHtml.ts
similarity index 92%
rename from renderer/_default.page.server.ts
rename to renderer/+onRenderHtml.ts
index 3f50db5..6b95973 100644
--- a/renderer/_default.page.server.ts
+++ b/renderer/+onRenderHtml.ts
@@ -9,9 +9,6 @@ import { createApp } from './app'
 import type { PageContextServer, PageContext } from '#types/PageContext'
 import type { App } from 'vue'
 
-// See https://vike.dev/data-fetching
-export const passToClient = ['pageProps', /* 'urlPathname', */ 'routeParams']
-
 async function render(pageContext: PageContextServer & PageContext) {
   const { app, i18n } = createApp(pageContext, false)
 
@@ -57,4 +54,4 @@ async function renderToString(app: App) {
   return appHtml
 }
 
-export { render }
+export default render
diff --git a/renderer/_default.page.client.ts b/renderer/_default.page.client.ts
deleted file mode 100644
index c0fddcd..0000000
--- a/renderer/_default.page.client.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { createApp } from './app'
-
-import type { PageContext, VikePageContext } from '#types/PageContext'
-
-let instance: ReturnType<typeof createApp>
-/* async */ function render(pageContext: VikePageContext & PageContext) {
-  if (!instance) {
-    instance = createApp(pageContext)
-    instance.app.mount('#app')
-  } else {
-    instance.app.changePage(pageContext)
-  }
-}
-
-function onHydrationEnd() {
-  // console.log('Hydration finished; page is now interactive.')
-}
-function onPageTransitionStart() {
-  // console.log('Page transition start')
-  // document.body.classList.add('page-transition')
-}
-function onPageTransitionEnd() {
-  // console.log('Page transition end')
-  // document.body.classList.remove('page-transition')
-}
-
-export const clientRouting = true
-export const prefetchStaticAssets = 'viewport'
-export { render }
-export { onHydrationEnd }
-export { onPageTransitionStart }
-export { onPageTransitionEnd }
diff --git a/src/pages/_error.page.vue b/src/pages/_error/+Page.vue
similarity index 100%
rename from src/pages/_error.page.vue
rename to src/pages/_error/+Page.vue
diff --git a/src/pages/_error.page.test.ts b/src/pages/_error/Page.test.ts
similarity index 100%
rename from src/pages/_error.page.test.ts
rename to src/pages/_error/Page.test.ts
diff --git a/src/pages/about/index.page.vue b/src/pages/about/+Page.vue
similarity index 100%
rename from src/pages/about/index.page.vue
rename to src/pages/about/+Page.vue
diff --git a/src/pages/app/index.page.vue b/src/pages/app/+Page.vue
similarity index 100%
rename from src/pages/app/index.page.vue
rename to src/pages/app/+Page.vue
diff --git a/src/pages/app/index.page.server.ts b/src/pages/app/+onBeforeRender.ts
similarity index 88%
rename from src/pages/app/index.page.server.ts
rename to src/pages/app/+onBeforeRender.ts
index 11bcb3a..230e729 100644
--- a/src/pages/app/index.page.server.ts
+++ b/src/pages/app/+onBeforeRender.ts
@@ -1,6 +1,6 @@
 import type { PageContextBuiltInServer } from 'vike/types'
 
-export { onBeforeRender }
+export default onBeforeRender
 
 /* async */ function onBeforeRender(pageContext: PageContextBuiltInServer) {
   return {
diff --git a/src/pages/app/index.page.route.ts b/src/pages/app/+route.ts
similarity index 100%
rename from src/pages/app/index.page.route.ts
rename to src/pages/app/+route.ts
diff --git a/src/pages/index/index.page.vue b/src/pages/index/+Page.vue
similarity index 100%
rename from src/pages/index/index.page.vue
rename to src/pages/index/+Page.vue