diff --git a/src/main.ts b/src/main.ts
index 1a4ecff..b04af5a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,8 +4,10 @@ import Vuex from 'vuex'
 import VuexPersistence from 'vuex-persist'
 import './registerServiceWorker'
 import App from './App.vue'
-import TimetablesPage from '@/pages/TimetablesPage.vue'
 import SettingsPage from '@/pages/SettingsPage.vue'
+import TimetablesHubPage from '@/pages/TimetablesHubPage.vue'
+import TimetablesLinePage from '@/pages/TimetablesLinePage.vue'
+import TimetablesStopPage from '@/pages/TimetablesStopPage.vue'
 
 Vue.config.productionTip = false
 Vue.use(VueRouter)
@@ -14,10 +16,9 @@ Vue.use(Vuex)
 const routes = [
   { path: '/', component: App },
   { path: '/settings', component: SettingsPage },
-  { path: '/timetables/', component: TimetablesPage },
-  { path: '/timetables/:tab', component: TimetablesPage },
-  { path: '/timetables/:tab/:line', component: TimetablesPage },
-  { path: '/timetables/:tab/:line/:stop', component: TimetablesPage },
+  { path: '/timetables/:tab', component: TimetablesHubPage },
+  { path: '/timetables/:tab/:line', component: TimetablesLinePage },
+  { path: '/timetables/:tab/:line/:stop', component: TimetablesStopPage },
 ]
 
 const router = new VueRouter({
diff --git a/src/components/Timetables/TimetablesHome.vue b/src/pages/TimetablesHubPage.vue
similarity index 93%
rename from src/components/Timetables/TimetablesHome.vue
rename to src/pages/TimetablesHubPage.vue
index 63e5d71..25e70ba 100644
--- a/src/components/Timetables/TimetablesHome.vue
+++ b/src/pages/TimetablesHubPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tab-page-new">
+  <div class="page">
     <div
       v-for="category in linesByCategory"
       :key="category.name"
@@ -29,7 +29,7 @@ import { getLinesByCategory } from '@/utils/localstore/lines'
 import DesignTitle from '@/components/design/DesignTitle.vue'
 
 export default Vue.extend({
-  name: 'TimetablesHome',
+  name: 'TimetablesHubPage',
   components: {
     LineIcon,
     DesignTitle,
@@ -43,7 +43,7 @@ export default Vue.extend({
 </script>
 
 <style scoped>
-.tab-page-new {
+.page {
   padding: 1rem;
 }
 
diff --git a/src/components/Timetables/TimetablesLine.vue b/src/pages/TimetablesLinePage.vue
similarity index 81%
rename from src/components/Timetables/TimetablesLine.vue
rename to src/pages/TimetablesLinePage.vue
index 465170e..bf865a5 100644
--- a/src/components/Timetables/TimetablesLine.vue
+++ b/src/pages/TimetablesLinePage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tab-page-line">
+  <div class="page">
     <LineRouteMap :line="$route.params.line"/>
   </div>
 </template>
@@ -9,13 +9,13 @@ import Vue from 'vue'
 import LineRouteMap from '@/components/LineMap/LineMap.vue'
 
 export default Vue.extend({
-  name: 'TimetablesLine',
+  name: 'TimetablesLinePage',
   components: { LineRouteMap },
 })
 </script>
 
 <style scoped>
-.tab-page-line {
+.page {
   padding: 10rem 1rem 4rem 1rem;
 }
 </style>
diff --git a/src/pages/TimetablesPage.vue b/src/pages/TimetablesPage.vue
deleted file mode 100644
index 6e59828..0000000
--- a/src/pages/TimetablesPage.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div>
-    <TabPageStop v-if="$route.params.line && $route.params.stop" />
-    <TabPageLine v-else-if="$route.params.line" />
-    <TabPageNew v-else />
-  </div>
-</template>
-
-<script lang="ts">
-import Vue from '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: 'TimetablesPage',
-  components: {
-    TabPageNew,
-    TabPageLine,
-    TabPageStop,
-  },
-})
-</script>
-
-<style scoped>
-</style>
diff --git a/src/components/Timetables/TimetablesStop.vue b/src/pages/TimetablesStopPage.vue
similarity index 93%
rename from src/components/Timetables/TimetablesStop.vue
rename to src/pages/TimetablesStopPage.vue
index e14f3a5..0cfca3a 100644
--- a/src/components/Timetables/TimetablesStop.vue
+++ b/src/pages/TimetablesStopPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tab-page-stop">
+  <div class="page">
     <StopHeader :stop="stop" />
     <StopPrevNextStops :stop="stop" />
     <StopTimetable :stop="stop" />
@@ -15,7 +15,7 @@ import StopPrevNextStops from '@/components/Stop/StopPrevNextStops.vue'
 import { getStop } from '@/utils/localstore/stops'
 
 export default Vue.extend({
-  name: 'TimetablesStop',
+  name: 'TimetablesStopPage',
   components: {
     StopTimetable,
     StopHeader,
@@ -45,7 +45,7 @@ export default Vue.extend({
 </script>
 
 <style scoped>
-.tab-page-stop {
+.page {
   padding: 0 1rem 8rem 1rem;
 }
 </style>