diff --git a/pages/setup/Completed.vue b/components/Completed.vue
similarity index 100%
rename from pages/setup/Completed.vue
rename to components/Completed.vue
diff --git a/pages/add/DateInput.vue b/components/DateInput.vue
similarity index 99%
rename from pages/add/DateInput.vue
rename to components/DateInput.vue
index 0cc27494..b7789d31 100644
--- a/pages/add/DateInput.vue
+++ b/components/DateInput.vue
@@ -52,7 +52,7 @@ v-col(cols=12)
 import dayjs from 'dayjs'
 import { mapState } from 'vuex'
 import List from '@/components/List'
-import { attributesFromEvents } from '../../assets/helper'
+import { attributesFromEvents } from '../assets/helper'
 
 export default {
   name: 'DateInput',
diff --git a/pages/setup/DbStep.vue b/components/DbStep.vue
similarity index 100%
rename from pages/setup/DbStep.vue
rename to components/DbStep.vue
diff --git a/pages/add/ImportDialog.vue b/components/ImportDialog.vue
similarity index 100%
rename from pages/add/ImportDialog.vue
rename to components/ImportDialog.vue
diff --git a/pages/add/MediaInput.vue b/components/MediaInput.vue
similarity index 100%
rename from pages/add/MediaInput.vue
rename to components/MediaInput.vue
diff --git a/pages/add/WhereInput.vue b/components/WhereInput.vue
similarity index 100%
rename from pages/add/WhereInput.vue
rename to components/WhereInput.vue
diff --git a/pages/event/embedEvent.vue b/components/embedEvent.vue
similarity index 96%
rename from pages/event/embedEvent.vue
rename to components/embedEvent.vue
index 22b7726d..83dd1954 100644
--- a/pages/event/embedEvent.vue
+++ b/components/embedEvent.vue
@@ -16,7 +16,7 @@ v-card
 </template>
 <script>
 import { mapState } from 'vuex'
-import clipboard from '../../assets/clipboard'
+import clipboard from '../assets/clipboard'
 import { mdiContentCopy, mdiInformation } from '@mdi/js'
 
 export default {
diff --git a/pages/event/eventAdmin.vue b/components/eventAdmin.vue
similarity index 100%
rename from pages/event/eventAdmin.vue
rename to components/eventAdmin.vue
diff --git a/pages/add/HourInput.vue b/pages/add/HourInput.vue
deleted file mode 100644
index 74cfc41b..00000000
--- a/pages/add/HourInput.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template lang="pug">
-  v-row
-    v-col.col-6
-      v-menu(v-model='startTimeMenu'
-        :close-on-content-click="false"
-        transition="slide-x-transition"
-        ref='startTimeMenu'
-        :return-value.sync="value.start"
-        offset-y
-        absolute
-        top
-        max-width="290px"
-        min-width="290px")
-        template(v-slot:activator='{ on }')
-          v-text-field(
-            :label="$t('event.from')"
-            prepend-icon='mdi-clock'
-            :rules="[$validators.required('event.from')]"
-            :value='value.start'
-            v-on='on'
-            clearable)
-        v-time-picker(
-          v-if='startTimeMenu'
-          :label="$t('event.from')"
-          format="24hr"
-          ref='time_start'
-          :allowed-minutes="[0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55]"
-          v-model='value.start'
-          @click:minute="selectTime('start')")
-
-    v-col.col-6
-      v-menu(v-model='endTimeMenu'
-          :close-on-content-click="false"
-          transition="slide-x-transition"
-          ref='endTimeMenu'
-          :return-value.sync="time.end"
-          offset-y
-          absolute
-          top
-          max-width="290px"
-          min-width="290px")
-        template(v-slot:activator='{ on }')
-          v-text-field(
-            prepend-icon='mdi-clock'
-            :label="$t('event.due')"
-            :value='value.end'
-            v-on='on'
-            clearable
-            readonly)
-        v-time-picker(
-          v-if='endTimeMenu'
-          :label="$t('event.due')"
-          format="24hr"
-          :allowed-minutes="[0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55]"
-          v-model='value.end'
-          @click:minute="selectTime('end')")
-
-</template>
-<script>
-export default {
-  name: 'HourInput',
-  props: {
-    value: { type: Object, default: () => { } }
-  },
-  data () {
-    return {
-      // time: { start: this.value.start, end: this.value.end },
-      time: {},
-      startTimeMenu: false,
-      endTimeMenu: false
-    }
-  },
-  methods: {
-    selectTime (type) {
-      this.$refs[`${type}TimeMenu`].save(this.value[type])
-      this.$emit('input', this.value)
-    }
-  }
-}
-</script>
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 00042eee..62acc2c9 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -141,8 +141,8 @@ export default {
   name: 'Event',
   mixins: [clipboard],
   components: {
-    EventAdmin: () => import(/* webpackChunkName: "event" */'./eventAdmin'),
-    EmbedEvent: () => import(/* webpackChunkName: "event" */'./embedEvent'),
+    EventAdmin: () => import(/* webpackChunkName: "event" */'@/components/eventAdmin'),
+    EmbedEvent: () => import(/* webpackChunkName: "event" */'@/components/embedEvent'),
     MyPicture
   },
   async asyncData ({ $axios, params, error }) {
diff --git a/pages/setup/_db.vue b/pages/setup/_db.vue
index fdc7c89b..0fdc6616 100644
--- a/pages/setup/_db.vue
+++ b/pages/setup/_db.vue
@@ -18,9 +18,9 @@ v-container.pa-6
         Completed(ref='completed' :isHttp='isHttp')
 </template>
 <script>
-import DbStep from './DbStep'
-import Settings from '../../components/admin/Settings'
-import Completed from './Completed'
+import DbStep from '@/components/DbStep'
+import Settings from '@/components/admin/Settings'
+import Completed from '@/components/Completed'
 
 export default {
   components: { DbStep, Settings, Completed },