diff --git a/app.config.ts b/app/app.config.ts
similarity index 100%
rename from app.config.ts
rename to app/app.config.ts
diff --git a/app.vue b/app/app.vue
similarity index 100%
rename from app.vue
rename to app/app.vue
diff --git a/assets/css/main.css b/app/assets/css/main.css
similarity index 100%
rename from assets/css/main.css
rename to app/assets/css/main.css
diff --git a/components/AutoUpdateToast.vue b/app/components/AutoUpdateToast.vue
similarity index 97%
rename from components/AutoUpdateToast.vue
rename to app/components/AutoUpdateToast.vue
index 1e08e1e..9b96337 100644
--- a/components/AutoUpdateToast.vue
+++ b/app/components/AutoUpdateToast.vue
@@ -2,7 +2,7 @@
   import { useIntervalFn } from '@vueuse/core'
   // @ts-expect-error
   import semverGt from 'semver/functions/gt'
-  import type VersionMeta from '~/public/version.json'
+  import type VersionMeta from '~~/public/version.json'
 
   const { t } = useI18n()
   const toast = useToast()
diff --git a/components/ColorModeButton.vue b/app/components/ColorModeButton.vue
similarity index 100%
rename from components/ColorModeButton.vue
rename to app/components/ColorModeButton.vue
diff --git a/components/ConfigManager.vue b/app/components/ConfigManager.vue
similarity index 100%
rename from components/ConfigManager.vue
rename to app/components/ConfigManager.vue
diff --git a/components/DeepResearch/DeepResearch.vue b/app/components/DeepResearch/DeepResearch.vue
similarity index 99%
rename from components/DeepResearch/DeepResearch.vue
rename to app/components/DeepResearch/DeepResearch.vue
index 8ab643a..72d709b 100644
--- a/components/DeepResearch/DeepResearch.vue
+++ b/app/components/DeepResearch/DeepResearch.vue
@@ -4,7 +4,7 @@
     type PartialProcessedSearchResult,
     type ProcessedSearchResult,
     type ResearchStep,
-  } from '~/lib/deep-research'
+  } from '~~/lib/deep-research'
   import {
     feedbackInjectionKey,
     formInjectionKey,
diff --git a/components/DeepResearch/NodeDetail.vue b/app/components/DeepResearch/NodeDetail.vue
similarity index 100%
rename from components/DeepResearch/NodeDetail.vue
rename to app/components/DeepResearch/NodeDetail.vue
diff --git a/components/DeepResearch/SearchFlow.vue b/app/components/DeepResearch/SearchFlow.vue
similarity index 100%
rename from components/DeepResearch/SearchFlow.vue
rename to app/components/DeepResearch/SearchFlow.vue
diff --git a/components/DeepResearch/SearchNode.vue b/app/components/DeepResearch/SearchNode.vue
similarity index 100%
rename from components/DeepResearch/SearchNode.vue
rename to app/components/DeepResearch/SearchNode.vue
diff --git a/components/GitHubButton.vue b/app/components/GitHubButton.vue
similarity index 100%
rename from components/GitHubButton.vue
rename to app/components/GitHubButton.vue
diff --git a/components/LangSwitcher.vue b/app/components/LangSwitcher.vue
similarity index 100%
rename from components/LangSwitcher.vue
rename to app/components/LangSwitcher.vue
diff --git a/components/PasswordInput.vue b/app/components/PasswordInput.vue
similarity index 100%
rename from components/PasswordInput.vue
rename to app/components/PasswordInput.vue
diff --git a/components/ReasoningAccordion.vue b/app/components/ReasoningAccordion.vue
similarity index 100%
rename from components/ReasoningAccordion.vue
rename to app/components/ReasoningAccordion.vue
diff --git a/components/ResearchFeedback.vue b/app/components/ResearchFeedback.vue
similarity index 96%
rename from components/ResearchFeedback.vue
rename to app/components/ResearchFeedback.vue
index 916eed7..f4f24e2 100644
--- a/components/ResearchFeedback.vue
+++ b/app/components/ResearchFeedback.vue
@@ -3,7 +3,7 @@
     feedbackInjectionKey,
     formInjectionKey,
   } from '~/constants/injection-keys'
-  import { generateFeedback } from '~/lib/feedback'
+  import { generateFeedback } from '~~/lib/feedback'
 
   export interface ResearchFeedbackResult {
     assistantQuestion: string
@@ -69,10 +69,10 @@
           // Incrementally update modelValue
           for (let i = 0; i < questions.length; i += 1) {
             if (feedback.value[i]) {
-              feedback.value[i].assistantQuestion = questions[i]
+              feedback.value[i]!.assistantQuestion = questions[i]!
             } else {
               feedback.value.push({
-                assistantQuestion: questions[i],
+                assistantQuestion: questions[i]!,
                 userAnswer: '',
               })
             }
diff --git a/components/ResearchForm.vue b/app/components/ResearchForm.vue
similarity index 100%
rename from components/ResearchForm.vue
rename to app/components/ResearchForm.vue
diff --git a/components/ResearchReport.vue b/app/components/ResearchReport.vue
similarity index 99%
rename from components/ResearchReport.vue
rename to app/components/ResearchReport.vue
index 16ce496..61406ed 100644
--- a/components/ResearchReport.vue
+++ b/app/components/ResearchReport.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
   import { marked } from 'marked'
-  import { writeFinalReport } from '~/lib/deep-research'
+  import { writeFinalReport } from '~~/lib/deep-research'
   import {
     feedbackInjectionKey,
     formInjectionKey,
diff --git a/composables/useAiProvider.ts b/app/composables/useAiProvider.ts
similarity index 100%
rename from composables/useAiProvider.ts
rename to app/composables/useAiProvider.ts
diff --git a/composables/useNodeLayout.ts b/app/composables/useNodeLayout.ts
similarity index 100%
rename from composables/useNodeLayout.ts
rename to app/composables/useNodeLayout.ts
diff --git a/composables/usePLimit.ts b/app/composables/usePLimit.ts
similarity index 100%
rename from composables/usePLimit.ts
rename to app/composables/usePLimit.ts
diff --git a/composables/useWebSearch.ts b/app/composables/useWebSearch.ts
similarity index 100%
rename from composables/useWebSearch.ts
rename to app/composables/useWebSearch.ts
diff --git a/constants/injection-keys.ts b/app/constants/injection-keys.ts
similarity index 87%
rename from constants/injection-keys.ts
rename to app/constants/injection-keys.ts
index 681cae3..c5ca90d 100644
--- a/constants/injection-keys.ts
+++ b/app/constants/injection-keys.ts
@@ -1,6 +1,6 @@
 import type { ResearchFeedbackResult } from '~/components/ResearchFeedback.vue'
 import type { ResearchInputData } from '~/components/ResearchForm.vue'
-import type { ResearchResult } from '~/lib/deep-research'
+import type { ResearchResult } from '~~/lib/deep-research'
 
 export const formInjectionKey = Symbol() as InjectionKey<Ref<ResearchInputData>>
 export const feedbackInjectionKey = Symbol() as InjectionKey<
diff --git a/layouts/default.vue b/app/layouts/default.vue
similarity index 100%
rename from layouts/default.vue
rename to app/layouts/default.vue
diff --git a/pages/index.vue b/app/pages/index.vue
similarity index 82%
rename from pages/index.vue
rename to app/pages/index.vue
index d02d0f5..59d627a 100644
--- a/pages/index.vue
+++ b/app/pages/index.vue
@@ -51,19 +51,19 @@
 </template>
 
 <script setup lang="ts">
-  import type ResearchForm from '~/components/ResearchForm.vue'
-  import type ResearchFeedback from '~/components/ResearchFeedback.vue'
-  import type DeepResearch from '~/components/DeepResearch/DeepResearch.vue'
-  import type ResearchReport from '~/components/ResearchReport.vue'
-  import type ConfigManager from '~/components/ConfigManager.vue'
-  import type { ResearchInputData } from '~/components/ResearchForm.vue'
-  import type { ResearchFeedbackResult } from '~/components/ResearchFeedback.vue'
-  import type { ResearchResult } from '~/lib/deep-research'
+  import type ResearchForm from '@/components/ResearchForm.vue'
+  import type ResearchFeedback from '@/components/ResearchFeedback.vue'
+  import type DeepResearch from '@/components/DeepResearch/DeepResearch.vue'
+  import type ResearchReport from '@/components/ResearchReport.vue'
+  import type ConfigManager from '@/components/ConfigManager.vue'
+  import type { ResearchInputData } from '@/components/ResearchForm.vue'
+  import type { ResearchFeedbackResult } from '@/components/ResearchFeedback.vue'
+  import type { ResearchResult } from '~~/lib/deep-research'
   import {
     feedbackInjectionKey,
     formInjectionKey,
     researchResultInjectionKey,
-  } from '~/constants/injection-keys'
+  } from '@/constants/injection-keys'
 
   const version = useRuntimeConfig().public.version
 
@@ -82,7 +82,6 @@
   const feedback = ref<ResearchFeedbackResult[]>([])
   const researchResult = ref<ResearchResult>({
     learnings: [],
-    visitedUrls: [],
   })
 
   provide(formInjectionKey, form)
diff --git a/stores/config.ts b/app/stores/config.ts
similarity index 98%
rename from stores/config.ts
rename to app/stores/config.ts
index ccb1f62..c8d2386 100644
--- a/stores/config.ts
+++ b/app/stores/config.ts
@@ -1,5 +1,5 @@
 import { skipHydrate } from 'pinia'
-import type { Locale } from '~/components/LangSwitcher.vue'
+import type { Locale } from '@/components/LangSwitcher.vue'
 
 export type ConfigAiProvider =
   | 'openai-compatible'
diff --git a/utils/prompt.ts b/app/utils/prompt.ts
similarity index 100%
rename from utils/prompt.ts
rename to app/utils/prompt.ts
diff --git a/utils/tree-node.ts b/app/utils/tree-node.ts
similarity index 100%
rename from utils/tree-node.ts
rename to app/utils/tree-node.ts
diff --git a/i18n.config.ts b/i18n.config.ts
index 267f24c..01617a3 100644
--- a/i18n.config.ts
+++ b/i18n.config.ts
@@ -1,6 +1,6 @@
-import en from '~/i18n/en.json'
-import zh from '~/i18n/zh.json'
-import nl from '~/i18n/nl.json'
+import en from '~~/i18n/en.json'
+import zh from '~~/i18n/zh.json'
+import nl from '~~/i18n/nl.json'
 
 export default defineI18nConfig(() => ({
   legacy: false,
diff --git a/lib/deep-research.ts b/lib/deep-research.ts
index ef9f982..a050984 100644
--- a/lib/deep-research.ts
+++ b/lib/deep-research.ts
@@ -1,13 +1,14 @@
 import { streamText } from 'ai'
 import { z } from 'zod'
-import { parseStreamingJson, type DeepPartial } from '~/utils/json'
+import { parseStreamingJson, type DeepPartial } from '~~/utils/json'
 
 import { trimPrompt } from './ai/providers'
 import { languagePrompt, systemPrompt } from './prompt'
 import zodToJsonSchema from 'zod-to-json-schema'
-import { useAiModel } from '~/composables/useAiProvider'
-import type { Locale } from '~/components/LangSwitcher.vue'
-import type { DeepResearchNode } from '~/components/DeepResearch/DeepResearch.vue'
+import { useAiModel } from '@/composables/useAiProvider'
+import type { Locale } from '@/components/LangSwitcher.vue'
+import type { DeepResearchNode } from '@/components/DeepResearch/DeepResearch.vue'
+import { throwAiError } from '~~/utils/errors'
 
 export type ResearchResult = {
   learnings: ProcessedSearchResult['learnings']
@@ -185,7 +186,7 @@ function processSearchResult({
     `<contents>${contents
       .map(
         (content, index) =>
-          `<content url="${results[index].url}">\n${content}\n</content>`,
+          `<content url="${results[index]!.url}">\n${content}\n</content>`,
       )
       .join('\n')}</contents>`,
     `You MUST respond in JSON matching this JSON schema: ${jsonSchema}`,
@@ -316,8 +317,8 @@ export async function deepResearch({
           for (let i = 0; i < searchQueries.length; i++) {
             onProgress({
               type: 'generating_query',
-              result: searchQueries[i],
-              nodeId: searchQueries[i].nodeId,
+              result: searchQueries[i]!,
+              nodeId: searchQueries[i]!.nodeId,
               parentNodeId: nodeId,
             })
           }
diff --git a/lib/feedback.ts b/lib/feedback.ts
index 13f836d..3e10093 100644
--- a/lib/feedback.ts
+++ b/lib/feedback.ts
@@ -4,6 +4,8 @@ import { zodToJsonSchema } from 'zod-to-json-schema'
 
 import { languagePrompt, systemPrompt } from './prompt'
 import { useAiModel } from '~/composables/useAiProvider'
+import { parseStreamingJson, type DeepPartial } from '~~/utils/json'
+import { throwAiError } from '~~/utils/errors'
 
 type PartialFeedback = DeepPartial<z.infer<typeof feedbackTypeSchema>>
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 55305bf..ee4bf68 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -62,5 +62,8 @@ export default defineNuxtConfig({
 
   css: ['~/assets/css/main.css'],
   compatibilityDate: '2024-11-01',
+  future: {
+    compatibilityVersion: 4,
+  },
   devtools: { enabled: true },
 })