diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index cb2652d..a37b498 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -28,7 +28,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import LineIcon from '@/components/LineIcon.vue'
-import DesignTime from '@/components/design/DesignTime.vue'
+import DesignTime from '@/components/ui/UiTime.vue'
 import { Time } from '@/utils/time'
 export default Vue.extend({
   name: 'AppHeader',
diff --git a/src/components/LineIcon.vue b/src/components/LineIcon.vue
index f0cd17d..bdaf0db 100644
--- a/src/components/LineIcon.vue
+++ b/src/components/LineIcon.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue'
-import DesignIcon, { DesignIconSize } from '@/components/design/DesignIcon.vue'
+import DesignIcon, { DesignIconSize } from '@/components/ui/UiIcon.vue'
 
 export type LineIconColor = 'colors' | 'light' | 'dark'
 
diff --git a/src/components/LineMap/LineMap.vue b/src/components/LineMap/LineMap.vue
index db92172..fc1e8a7 100644
--- a/src/components/LineMap/LineMap.vue
+++ b/src/components/LineMap/LineMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <LineRouteMapTable
+  <LineMapTable
     :line="line"
     :routeMap="routeMap"
   />
@@ -7,13 +7,13 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineRouteMapTable from './LineMapTable.vue'
+import LineMapTable from './LineMapTable.vue'
 import { RouteMapType } from '@/utils/parser'
 import { getLineRouteMap } from '@/utils/localstore/lines'
 
 export default Vue.extend({
   name: 'LineMap',
-  components: { LineRouteMapTable },
+  components: { LineMapTable },
   props: {
     line: String,
   },
diff --git a/src/components/Stop/StopHeader.vue b/src/components/Stop/StopHeader.vue
index 25d7223..acea049 100644
--- a/src/components/Stop/StopHeader.vue
+++ b/src/components/Stop/StopHeader.vue
@@ -20,7 +20,7 @@
 import Vue, { PropType } from 'vue'
 import { StopType } from '@/utils/parser'
 import LineIcon from '@/components/LineIcon.vue'
-import DesignPageTitle from '@/components/design/DesignPageTitle.vue'
+import DesignPageTitle from '@/components/ui/UiPageTitle.vue'
 
 export default Vue.extend({
   name: 'StopHeader',
diff --git a/src/components/Stop/StopPrevNextStops.vue b/src/components/Stop/StopPrevNextStops.vue
index e490eea..d06aa72 100644
--- a/src/components/Stop/StopPrevNextStops.vue
+++ b/src/components/Stop/StopPrevNextStops.vue
@@ -15,7 +15,7 @@
 import Vue, { PropType } from 'vue'
 import { StopType } from '@/utils/parser'
 import { getStop } from '@/utils/localstore/stops'
-import DesignPrevNext from '@/components/design/DesignPrevNext.vue'
+import DesignPrevNext from '@/components/ui/UiPrevNext.vue'
 
 export default Vue.extend({
   name: 'StopPrevNextStops',
diff --git a/src/components/Stop/StopSchedulesVisits.vue b/src/components/Stop/StopSchedulesVisits.vue
index 27adf55..926c824 100644
--- a/src/components/Stop/StopSchedulesVisits.vue
+++ b/src/components/Stop/StopSchedulesVisits.vue
@@ -116,7 +116,7 @@
 import Vue, { PropType } from 'vue'
 import { VisitType } from '@/utils/fetcher'
 import { toTime } from '@/utils/time'
-import DesignTime from '@/components/design/DesignTime.vue'
+import DesignTime from '@/components/ui/UiTime.vue'
 
 export default Vue.extend({
   name: 'StopSchedulesVisits',
diff --git a/src/components/design/DesignContentTitle.vue b/src/components/ui/UiContentTitle.vue
similarity index 92%
rename from src/components/design/DesignContentTitle.vue
rename to src/components/ui/UiContentTitle.vue
index 46b09b1..43d9aca 100644
--- a/src/components/design/DesignContentTitle.vue
+++ b/src/components/ui/UiContentTitle.vue
@@ -11,7 +11,7 @@
 import Vue from 'vue'
 
 export default Vue.extend({
-  name: 'DesignContentTitle',
+  name: 'UiContentTitle',
 })
 </script>
 
diff --git a/src/components/design/DesignIcon.vue b/src/components/ui/UiIcon.vue
similarity index 87%
rename from src/components/design/DesignIcon.vue
rename to src/components/ui/UiIcon.vue
index 62f69ee..db1de65 100644
--- a/src/components/design/DesignIcon.vue
+++ b/src/components/ui/UiIcon.vue
@@ -14,14 +14,14 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 
-export type DesignIconSize = 'sm' | 'md' | 'lg'
+export type UiIconSize = 'sm' | 'md' | 'lg'
 
 export default Vue.extend({
-  name: 'DesignIcon',
+  name: 'UiIcon',
   props: {
     src: String,
     alt: String,
-    size: String as PropType<DesignIconSize>,
+    size: String as PropType<UiIconSize>,
     fadeIn: {
       type: Boolean,
       default: false,
diff --git a/src/components/design/DesignPageTitle.vue b/src/components/ui/UiPageTitle.vue
similarity index 91%
rename from src/components/design/DesignPageTitle.vue
rename to src/components/ui/UiPageTitle.vue
index 9443a90..f48466e 100644
--- a/src/components/design/DesignPageTitle.vue
+++ b/src/components/ui/UiPageTitle.vue
@@ -11,7 +11,7 @@
 import Vue from 'vue'
 
 export default Vue.extend({
-  name: 'DesignContentTitle',
+  name: 'UiContentTitle',
   props: {
     text: String,
   },
diff --git a/src/components/design/DesignPrevNext.vue b/src/components/ui/UiPrevNext.vue
similarity index 98%
rename from src/components/design/DesignPrevNext.vue
rename to src/components/ui/UiPrevNext.vue
index 0fea777..c183581 100644
--- a/src/components/design/DesignPrevNext.vue
+++ b/src/components/ui/UiPrevNext.vue
@@ -38,7 +38,7 @@ export type PrevNextItem = {
 }
 
 export default Vue.extend({
-  name: 'DesignPrevNext',
+  name: 'UiPrevNext',
   props: {
     prevItems: [] as PropType<PrevNextItem[]>,
     nextItems: [] as PropType<PrevNextItem[]>,
diff --git a/src/components/design/DesignTime.vue b/src/components/ui/UiTime.vue
similarity index 97%
rename from src/components/design/DesignTime.vue
rename to src/components/ui/UiTime.vue
index 6b480d8..7b6ae95 100644
--- a/src/components/design/DesignTime.vue
+++ b/src/components/ui/UiTime.vue
@@ -14,7 +14,7 @@
 import { Time } from '@/utils/time'
 import Vue, { PropType } from 'vue'
 export default Vue.extend({
-  name: 'DesignTime',
+  name: 'UiTime',
   props: {
     datetime: {} as PropType<Time>,
     textGray: Boolean,
diff --git a/src/pages/TimetablesHubPage.vue b/src/pages/TimetablesHubPage.vue
index a9ccee7..fbfb96a 100644
--- a/src/pages/TimetablesHubPage.vue
+++ b/src/pages/TimetablesHubPage.vue
@@ -26,7 +26,7 @@
 import Vue from 'vue'
 import LineIcon from '@/components/LineIcon.vue'
 import { getLinesByCategory } from '@/utils/localstore/lines'
-import DesignContentTitle from '@/components/design/DesignContentTitle.vue'
+import DesignContentTitle from '@/components/ui/UiContentTitle.vue'
 
 export default Vue.extend({
   name: 'TimetablesHubPage',