diff --git a/blivedm b/blivedm
index fe5b4ca..39fb86a 160000
--- a/blivedm
+++ b/blivedm
@@ -1 +1 @@
-Subproject commit fe5b4ca2c94757f5501a207d648ebd613ebbb6f7
+Subproject commit 39fb86a9b20f8d94501dd2e25f16a1c573b1e33f
diff --git a/frontend/src/components/.gitkeep b/frontend/src/components/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/src/main.js b/frontend/src/main.js
index dd982b2..0621327 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -2,12 +2,16 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 import App from './App.vue'
-import Home from './components/Home.vue'
-import Room from './components/Room.vue'
-import NotFound from './components/NotFound.vue'
+import Home from './views/Home.vue'
+import Room from './views/Room'
+import NotFound from './views/NotFound.vue'
 
 Vue.use(VueRouter)
 
+Vue.config.ignoredElements = [
+  /^yt-/
+]
+
 const router = new VueRouter({
   mode: 'history',
   routes: [
diff --git a/frontend/src/components/Home.vue b/frontend/src/views/Home.vue
similarity index 100%
rename from frontend/src/components/Home.vue
rename to frontend/src/views/Home.vue
diff --git a/frontend/src/components/NotFound.vue b/frontend/src/views/NotFound.vue
similarity index 100%
rename from frontend/src/components/NotFound.vue
rename to frontend/src/views/NotFound.vue
diff --git a/frontend/src/components/LegacyPaidMessage.vue b/frontend/src/views/Room/LegacyPaidMessage.vue
similarity index 100%
rename from frontend/src/components/LegacyPaidMessage.vue
rename to frontend/src/views/Room/LegacyPaidMessage.vue
diff --git a/frontend/src/components/PaidMessage.vue b/frontend/src/views/Room/PaidMessage.vue
similarity index 100%
rename from frontend/src/components/PaidMessage.vue
rename to frontend/src/views/Room/PaidMessage.vue
diff --git a/frontend/src/components/TextMessage.vue b/frontend/src/views/Room/TextMessage.vue
similarity index 100%
rename from frontend/src/components/TextMessage.vue
rename to frontend/src/views/Room/TextMessage.vue
diff --git a/frontend/src/components/Room.vue b/frontend/src/views/Room/index.vue
similarity index 94%
rename from frontend/src/components/Room.vue
rename to frontend/src/views/Room/index.vue
index 7abf827..f2215f4 100644
--- a/frontend/src/components/Room.vue
+++ b/frontend/src/views/Room/index.vue
@@ -57,9 +57,9 @@ export default {
     }
   },
   created() {
-    this.websocket = new WebSocket(`ws://${window.location.host}/chat`)
-    // 测试用
-    // this.websocket = new WebSocket('ws://localhost/chat')
+    // 开发时使用localhost:80
+    const url = process.env.NODE_ENV === 'development' ? 'ws://localhost/chat' : `ws://${window.location.host}/chat`
+    this.websocket = new WebSocket(url)
     this.websocket.onopen = () => this.websocket.send(JSON.stringify({
       cmd: COMMAND_JOIN_ROOM,
       data: {
@@ -122,4 +122,4 @@ export default {
 }
 </script>
 
-<style src="../assets/room.css"></style>
+<style src="../../assets/room.css"></style>