diff --git a/src/components/ExternalAIPanel.vue b/src/components/ai/ExternalAIPanel.vue
similarity index 97%
rename from src/components/ExternalAIPanel.vue
rename to src/components/ai/ExternalAIPanel.vue
index a61f6a7..ed2761d 100644
--- a/src/components/ExternalAIPanel.vue
+++ b/src/components/ai/ExternalAIPanel.vue
@@ -46,8 +46,8 @@
 <script setup lang="ts">
 import { ref, watch } from "vue"
 import { useMessage } from "naive-ui"
-import { html, css, js } from "../store/editors"
-import { Submission } from "../api"
+import { html, css, js } from "../../store/editors"
+import { Submission } from "../../api"
 
 const props = defineProps<{ taskId: number }>()
 const message = useMessage()
diff --git a/src/components/PromptPanel.vue b/src/components/ai/PromptPanel.vue
similarity index 99%
rename from src/components/PromptPanel.vue
rename to src/components/ai/PromptPanel.vue
index 891e596..730acde 100644
--- a/src/components/PromptPanel.vue
+++ b/src/components/ai/PromptPanel.vue
@@ -56,7 +56,7 @@ import {
   streaming,
   streamingContent,
   sendPrompt,
-} from "../store/prompt"
+} from "../../store/prompt"
 
 const input = ref("")
 const messagesRef = ref<HTMLElement>()
diff --git a/src/pages/ChallengeHome.vue b/src/pages/ChallengeDetail.vue
similarity index 96%
rename from src/pages/ChallengeHome.vue
rename to src/pages/ChallengeDetail.vue
index b8d7d0f..cc23907 100644
--- a/src/pages/ChallengeHome.vue
+++ b/src/pages/ChallengeDetail.vue
@@ -76,10 +76,10 @@ import { useRoute, useRouter } from "vue-router"
 import { useMessage } from "naive-ui"
 import { Icon } from "@iconify/vue"
 import { marked } from "marked"
-import PromptPanel from "../components/PromptPanel.vue"
-import ExternalAIPanel from "../components/ExternalAIPanel.vue"
+import PromptPanel from "../components/ai/PromptPanel.vue"
+import ExternalAIPanel from "../components/ai/ExternalAIPanel.vue"
 import Preview from "../components/editor/Preview.vue"
-import TaskStatsModal from "../components/TaskStatsModal.vue"
+import TaskStatsModal from "../components/task/TaskStatsModal.vue"
 import { Challenge, Submission } from "../api"
 import { html, css, js } from "../store/editors"
 import { taskId, taskTab, challengeDisplay } from "../store/task"
diff --git a/src/pages/Home.vue b/src/pages/Workspace.vue
similarity index 100%
rename from src/pages/Home.vue
rename to src/pages/Workspace.vue
diff --git a/src/router.ts b/src/router.ts
index e33d617..84823c6 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,18 +1,18 @@
 import { createWebHistory, createRouter } from "vue-router"
 import { loginModal } from "./store/modal"
 
-import Home from "./pages/Home.vue"
+import Workspace from "./pages/Workspace.vue"
 import { STORAGE_KEY } from "./utils/const"
 
 const routes = [
-  { path: "/", name: "home", component: Home },
-  { path: "/tutorial", name: "home-tutorial-list", component: Home },
-  { path: "/tutorial/:display", name: "home-tutorial", component: Home },
-  { path: "/challenge", name: "home-challenge-list", component: Home },
+  { path: "/", name: "home", component: Workspace },
+  { path: "/tutorial", name: "home-tutorial-list", component: Workspace },
+  { path: "/tutorial/:display", name: "home-tutorial", component: Workspace },
+  { path: "/challenge", name: "home-challenge-list", component: Workspace },
   {
     path: "/challenge/:display",
     name: "home-challenge",
-    component: () => import("./pages/ChallengeHome.vue"),
+    component: () => import("./pages/ChallengeDetail.vue"),
   },
   {
     path: "/submissions/:page",