diff --git a/src/App.vue b/src/App.vue
index 3fea1da..2b22203 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="app">
-    <AppHeader />
-    <AppPageView />
+    <AppView />
   </div>
 </template>
 
@@ -10,15 +9,13 @@ import Vue from 'vue'
 import '@fontsource/inter/latin-500.css'
 import '@fontsource/inter/latin-600.css'
 import '@fontsource/inter/latin-700.css'
-import AppHeader from '@/components/AppHeader.vue'
-import AppPageView from '@/components/AppPageView.vue'
+import AppView from '@/components/AppView.vue'
 import { lastUpdatedAt, synchronize } from './utils/localstore/synchronizer'
 
 export default Vue.extend({
   name: 'App',
   components: {
-    AppHeader,
-    AppPageView,
+    AppView,
   },
   created () {
     if (!lastUpdatedAt()) {
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index 745983b..53dbd35 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineIcon from '@/components/Line/Icon.vue'
+import LineIcon from '@/components/LineIcon.vue'
 import TimeClock from '@/components/TimeClock.vue'
 import { DateTime } from '@/utils/datetime'
 export default Vue.extend({
diff --git a/src/components/AppNav.vue b/src/components/AppNav.vue
index 326d99c..4ae9eb9 100644
--- a/src/components/AppNav.vue
+++ b/src/components/AppNav.vue
@@ -61,7 +61,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { getStop } from '@/utils/localstore/stops'
-import LineIcon from '@/components/Line/Icon.vue'
+import LineIcon from '@/components/LineIcon.vue'
 
 export default Vue.extend({
   name: 'AppNav',
diff --git a/src/components/AppPageView.vue b/src/components/AppView.vue
similarity index 77%
rename from src/components/AppPageView.vue
rename to src/components/AppView.vue
index a7a596f..67959e9 100644
--- a/src/components/AppPageView.vue
+++ b/src/components/AppView.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <AppHeader />
     <div class="tab">
       <router-view>
       </router-view>
@@ -11,10 +12,12 @@
 <script lang="ts">
 import Vue from 'vue'
 import AppNav from '@/components/AppNav.vue'
+import AppHeader from '@/components/AppHeader.vue'
 
 export default Vue.extend({
-  name: 'AppPageView',
+  name: 'AppView',
   components: {
+    AppHeader,
     AppNav,
   },
 })
diff --git a/src/components/Line/Icon.vue b/src/components/LineIcon.vue
similarity index 100%
rename from src/components/Line/Icon.vue
rename to src/components/LineIcon.vue
diff --git a/src/components/Line/RouteMap/index.vue b/src/components/LineMap/LineMap.vue
similarity index 89%
rename from src/components/Line/RouteMap/index.vue
rename to src/components/LineMap/LineMap.vue
index 9437aac..db92172 100644
--- a/src/components/Line/RouteMap/index.vue
+++ b/src/components/LineMap/LineMap.vue
@@ -7,12 +7,12 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineRouteMapTable from './Table.vue'
+import LineRouteMapTable from './LineMapTable.vue'
 import { RouteMapType } from '@/utils/parser'
 import { getLineRouteMap } from '@/utils/localstore/lines'
 
 export default Vue.extend({
-  name: 'LineRouteMap',
+  name: 'LineMap',
   components: { LineRouteMapTable },
   props: {
     line: String,
diff --git a/src/components/Line/RouteMap/DrawingCell.vue b/src/components/LineMap/LineMapDrawingCell.vue
similarity index 98%
rename from src/components/Line/RouteMap/DrawingCell.vue
rename to src/components/LineMap/LineMapDrawingCell.vue
index 164ccde..4104e9f 100644
--- a/src/components/Line/RouteMap/DrawingCell.vue
+++ b/src/components/LineMap/LineMapDrawingCell.vue
@@ -53,7 +53,7 @@
 import Vue from 'vue'
 
 export default Vue.extend({
-  name: 'LineRouteMapDrawingCell',
+  name: 'LineMapDrawingCell',
   props: {
     content: String,
     isLargeCircle: {
diff --git a/src/components/Line/RouteMap/LabelCell.vue b/src/components/LineMap/LineMapLabelCell.vue
similarity index 93%
rename from src/components/Line/RouteMap/LabelCell.vue
rename to src/components/LineMap/LineMapLabelCell.vue
index ba41652..e74802b 100644
--- a/src/components/Line/RouteMap/LabelCell.vue
+++ b/src/components/LineMap/LineMapLabelCell.vue
@@ -25,10 +25,10 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { LineConnectionType } from '@/utils/parser'
-import LineIcon from '@/components/Line/Icon.vue'
+import LineIcon from '@/components/LineIcon.vue'
 
 export default Vue.extend({
-  name: 'LineRouteMapLabelCell',
+  name: 'LineMapLabelCell',
   components: { LineIcon },
   props: {
     stopName: String,
diff --git a/src/components/Line/RouteMap/Table.vue b/src/components/LineMap/LineMapTable.vue
similarity index 93%
rename from src/components/Line/RouteMap/Table.vue
rename to src/components/LineMap/LineMapTable.vue
index b8ce1c6..23f2bd9 100644
--- a/src/components/Line/RouteMap/Table.vue
+++ b/src/components/LineMap/LineMapTable.vue
@@ -23,11 +23,11 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { RouteMapType } from '@/utils/parser'
-import DrawingCell from './DrawingCell.vue'
-import LabelCell from './LabelCell.vue'
+import DrawingCell from './LineMapDrawingCell.vue'
+import LabelCell from './LineMapLabelCell.vue'
 
 export default Vue.extend({
-  name: 'LineRouteMapTable',
+  name: 'LineMapTable',
   components: { DrawingCell, LabelCell },
   props: {
     line: String,
diff --git a/src/components/Stop/Header.vue b/src/components/Stop/StopHeader.vue
similarity index 95%
rename from src/components/Stop/Header.vue
rename to src/components/Stop/StopHeader.vue
index 33138bd..e1ef10c 100644
--- a/src/components/Stop/Header.vue
+++ b/src/components/Stop/StopHeader.vue
@@ -17,7 +17,7 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { StopType } from '@/utils/parser'
-import LineIcon from '@/components/Line/Icon.vue'
+import LineIcon from '@/components/LineIcon.vue'
 
 export default Vue.extend({
   name: 'StopHeader',
diff --git a/src/components/Stop/PrevNextStops.vue b/src/components/Stop/StopPrevNextStops.vue
similarity index 100%
rename from src/components/Stop/PrevNextStops.vue
rename to src/components/Stop/StopPrevNextStops.vue
diff --git a/src/components/Stop/Timetable/index.vue b/src/components/Stop/StopSchedules.vue
similarity index 96%
rename from src/components/Stop/Timetable/index.vue
rename to src/components/Stop/StopSchedules.vue
index 423844a..0c0b3d9 100644
--- a/src/components/Stop/Timetable/index.vue
+++ b/src/components/Stop/StopSchedules.vue
@@ -24,13 +24,13 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import TrainVisits from '@/components/Stop/Timetable/Visits.vue'
+import TrainVisits from '@/components/Stop/StopSchedulesVisits.vue'
 import { StopType } from '@/utils/parser'
 import { fetchTimetables, VisitType } from '@/utils/fetcher'
 import { getLinesByRef } from '@/utils/localstore/lines'
 
 export default Vue.extend({
-  name: 'StopTimetable',
+  name: 'StopSchedules',
   components: {
     TrainVisits,
   },
diff --git a/src/components/Stop/Timetable/Visits.vue b/src/components/Stop/StopSchedulesVisits.vue
similarity index 99%
rename from src/components/Stop/Timetable/Visits.vue
rename to src/components/Stop/StopSchedulesVisits.vue
index 1fc7493..2507b03 100644
--- a/src/components/Stop/Timetable/Visits.vue
+++ b/src/components/Stop/StopSchedulesVisits.vue
@@ -119,7 +119,7 @@ import { toDateTime } from '@/utils/datetime'
 import TimeClock from '@/components/TimeClock.vue'
 
 export default Vue.extend({
-  name: 'StopTimetableVisits',
+  name: 'StopSchedulesVisits',
   components: {
     TimeClock,
   },
diff --git a/src/pages/TabPage/New.vue b/src/components/Timetables/TimetablesHome.vue
similarity index 93%
rename from src/pages/TabPage/New.vue
rename to src/components/Timetables/TimetablesHome.vue
index 5f06fbe..c406ad7 100644
--- a/src/pages/TabPage/New.vue
+++ b/src/components/Timetables/TimetablesHome.vue
@@ -14,11 +14,11 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineIcon from '@/components/Line/Icon.vue'
+import LineIcon from '@/components/LineIcon.vue'
 import { getLinesByCategory } from '@/utils/localstore/lines'
 
 export default Vue.extend({
-  name: 'TabPageNew',
+  name: 'TimetablesHome',
   components: { LineIcon },
   computed: {
     linesByCategory () {
diff --git a/src/pages/TabPage/Line.vue b/src/components/Timetables/TimetablesLine.vue
similarity index 77%
rename from src/pages/TabPage/Line.vue
rename to src/components/Timetables/TimetablesLine.vue
index d549269..465170e 100644
--- a/src/pages/TabPage/Line.vue
+++ b/src/components/Timetables/TimetablesLine.vue
@@ -6,10 +6,10 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineRouteMap from '@/components/Line/RouteMap/index.vue'
+import LineRouteMap from '@/components/LineMap/LineMap.vue'
 
 export default Vue.extend({
-  name: 'TabPageLine',
+  name: 'TimetablesLine',
   components: { LineRouteMap },
 })
 </script>
diff --git a/src/pages/TabPage/Stop.vue b/src/components/Timetables/TimetablesStop.vue
similarity index 78%
rename from src/pages/TabPage/Stop.vue
rename to src/components/Timetables/TimetablesStop.vue
index ddc1bc8..e14f3a5 100644
--- a/src/pages/TabPage/Stop.vue
+++ b/src/components/Timetables/TimetablesStop.vue
@@ -9,13 +9,13 @@
 <script lang="ts">
 import Vue from 'vue'
 import { StopType } from '@/utils/parser'
-import StopTimetable from '@/components/Stop/Timetable/index.vue'
-import StopHeader from '@/components/Stop/Header.vue'
-import StopPrevNextStops from '@/components/Stop/PrevNextStops.vue'
+import StopTimetable from '@/components/Stop/StopSchedules.vue'
+import StopHeader from '@/components/Stop/StopHeader.vue'
+import StopPrevNextStops from '@/components/Stop/StopPrevNextStops.vue'
 import { getStop } from '@/utils/localstore/stops'
 
 export default Vue.extend({
-  name: 'TabPageStop',
+  name: 'TimetablesStop',
   components: {
     StopTimetable,
     StopHeader,
diff --git a/src/main.ts b/src/main.ts
index e159d16..1a4ecff 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
 import VuexPersistence from 'vuex-persist'
 import './registerServiceWorker'
 import App from './App.vue'
-import TabPage from '@/pages/TabPage/index.vue'
+import TimetablesPage from '@/pages/TimetablesPage.vue'
 import SettingsPage from '@/pages/SettingsPage.vue'
 
 Vue.config.productionTip = false
@@ -14,10 +14,10 @@ Vue.use(Vuex)
 const routes = [
   { path: '/', component: App },
   { path: '/settings', component: SettingsPage },
-  { path: '/timetables/', component: TabPage },
-  { path: '/timetables/:tab', component: TabPage },
-  { path: '/timetables/:tab/:line', component: TabPage },
-  { path: '/timetables/:tab/:line/:stop', component: TabPage },
+  { path: '/timetables/', component: TimetablesPage },
+  { path: '/timetables/:tab', component: TimetablesPage },
+  { path: '/timetables/:tab/:line', component: TimetablesPage },
+  { path: '/timetables/:tab/:line/:stop', component: TimetablesPage },
 ]
 
 const router = new VueRouter({
diff --git a/src/pages/TabPage/index.vue b/src/pages/TimetablesPage.vue
similarity index 61%
rename from src/pages/TabPage/index.vue
rename to src/pages/TimetablesPage.vue
index 56136a1..6e59828 100644
--- a/src/pages/TabPage/index.vue
+++ b/src/pages/TimetablesPage.vue
@@ -8,12 +8,12 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import TabPageNew from '@/pages/TabPage/New.vue'
-import TabPageLine from '@/pages/TabPage/Line.vue'
-import TabPageStop from '@/pages/TabPage/Stop.vue'
+import TabPageNew from '@/components/Timetables/TimetablesHome.vue'
+import TabPageLine from '@/components/Timetables/TimetablesLine.vue'
+import TabPageStop from '@/components/Timetables/TimetablesStop.vue'
 
 export default Vue.extend({
-  name: 'TabPage',
+  name: 'TimetablesPage',
   components: {
     TabPageNew,
     TabPageLine,