diff --git a/web/src/components/UserTitle.vue b/web/src/components/UserTitle.vue
index 8d4e722..6fba9cd 100644
--- a/web/src/components/UserTitle.vue
+++ b/web/src/components/UserTitle.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import Avatar from '../components/Avatar.vue'
+import Avatar from '@/components/Avatar.vue'
 import DistinguishedNameBreadcrumb from './ui/DistinguishedNameBreadcrumb.vue'
 import RoleBadge from './ui/RoleBadge.vue'
 
diff --git a/web/src/components/Charts/AccessPointClientsChart.vue b/web/src/components/charts/AccessPointClientsChart.vue
similarity index 100%
rename from web/src/components/Charts/AccessPointClientsChart.vue
rename to web/src/components/charts/AccessPointClientsChart.vue
diff --git a/web/src/components/Charts/AccessPointSignalStrengthChart.vue b/web/src/components/charts/AccessPointSignalStrengthChart.vue
similarity index 100%
rename from web/src/components/Charts/AccessPointSignalStrengthChart.vue
rename to web/src/components/charts/AccessPointSignalStrengthChart.vue
diff --git a/web/src/components/DataTables/AccessPointClientsDataTable.vue b/web/src/components/dataTables/AccessPointClientsDataTable.vue
similarity index 100%
rename from web/src/components/DataTables/AccessPointClientsDataTable.vue
rename to web/src/components/dataTables/AccessPointClientsDataTable.vue
diff --git a/web/src/components/DataTables/UserTD.vue b/web/src/components/dataTables/UserTD.vue
similarity index 100%
rename from web/src/components/DataTables/UserTD.vue
rename to web/src/components/dataTables/UserTD.vue
diff --git a/web/src/components/DataTables/UserWifiDevicesDataTable.vue b/web/src/components/dataTables/UserWifiDevicesDataTable.vue
similarity index 100%
rename from web/src/components/DataTables/UserWifiDevicesDataTable.vue
rename to web/src/components/dataTables/UserWifiDevicesDataTable.vue
diff --git a/web/src/components/DataTables/WifiDevicesDataTable.vue b/web/src/components/dataTables/WifiDevicesDataTable.vue
similarity index 100%
rename from web/src/components/DataTables/WifiDevicesDataTable.vue
rename to web/src/components/dataTables/WifiDevicesDataTable.vue
diff --git a/web/src/components/DataTables/WifiUsersDataTable.vue b/web/src/components/dataTables/WifiUsersDataTable.vue
similarity index 100%
rename from web/src/components/DataTables/WifiUsersDataTable.vue
rename to web/src/components/dataTables/WifiUsersDataTable.vue
diff --git a/web/src/layouts/Default.vue b/web/src/layouts/Default.vue
index 3b67af3..58e8bec 100755
--- a/web/src/layouts/Default.vue
+++ b/web/src/layouts/Default.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import MainDrawer from '../components/MainDrawer'
+import MainDrawer from '@/components/MainDrawer'
 
 import UserMenu from '@/components/UserMenu'
 
diff --git a/web/src/views/About.vue b/web/src/views/About.vue
index faf27cd..b1d0b65 100755
--- a/web/src/views/About.vue
+++ b/web/src/views/About.vue
@@ -8,7 +8,7 @@
   </v-container>
 </template>
 <script>
-import AboutCard from '../components/AboutCard'
+import AboutCard from '@/components/AboutCard'
 export default {
   components: { AboutCard }
 }
diff --git a/web/src/views/AccessPoints/clients.vue b/web/src/views/AccessPoints/clients.vue
index 836c1a7..3e955eb 100644
--- a/web/src/views/AccessPoints/clients.vue
+++ b/web/src/views/AccessPoints/clients.vue
@@ -74,10 +74,10 @@
 <script>
 import gql from 'graphql-tag'
 
-import ApIcon from '../../components/ApIcon.vue'
-import AccessPointClientsDataTable from '../../components/DataTables/AccessPointClientsDataTable.vue'
-import AccessPointClientsChart from '../../components/Charts/AccessPointClientsChart.vue'
-import AccessPointSignalStrengthChart from '../../components/Charts/AccessPointSignalStrengthChart.vue'
+import ApIcon from '@/components/ApIcon.vue'
+import AccessPointClientsDataTable from '@/components/dataTables/AccessPointClientsDataTable.vue'
+import AccessPointClientsChart from '@/components/charts/AccessPointClientsChart.vue'
+import AccessPointSignalStrengthChart from '@/components/charts/AccessPointSignalStrengthChart.vue'
 
 export default {
   name: 'SingleAccessPoint',
diff --git a/web/src/views/CreateToken.vue b/web/src/views/CreateToken.vue
index 0675fae..89568ce 100755
--- a/web/src/views/CreateToken.vue
+++ b/web/src/views/CreateToken.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import CreateTokenForm from '../components/CreateTokenForm'
+import CreateTokenForm from '@/components/CreateTokenForm'
 export default {
   name: 'GenerateToken',
   components: { CreateTokenForm }
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index 677c1c5..e6669eb 100755
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -21,10 +21,10 @@
 </template>
 
 <script>
-import UserInfoWidget from '../components/widgets/UserInfoWidget'
-import TokenStatsWidget from '../components/widgets/TokenStatsWidget'
-import DevicesWidget from '../components/widgets/DevicesWidget'
-import StatsWidget from '../components/widgets/StatsWidget'
+import UserInfoWidget from '@/components/widgets/UserInfoWidget'
+import TokenStatsWidget from '@/components/widgets/TokenStatsWidget'
+import DevicesWidget from '@/components/widgets/DevicesWidget'
+import StatsWidget from '@/components/widgets/StatsWidget'
 import gql from 'graphql-tag'
 
 export default {
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 9f7b374..7eb110e 100755
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import LoginForm from '../components/LoginForm'
+import LoginForm from '@/components/LoginForm'
 
 export default {
   name: 'Login',
diff --git a/web/src/views/ReplacePassword.vue b/web/src/views/ReplacePassword.vue
index 76b587a..7108333 100755
--- a/web/src/views/ReplacePassword.vue
+++ b/web/src/views/ReplacePassword.vue
@@ -14,7 +14,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import ReplacePasswordForm from '../components/ReplacePasswordForm'
+import ReplacePasswordForm from '@/components/ReplacePasswordForm'
 
 export default {
   name: 'ReplacePassword',
diff --git a/web/src/views/ReplaceStudentPassword.vue b/web/src/views/ReplaceStudentPassword.vue
index ef4aeaf..828b7ca 100644
--- a/web/src/views/ReplaceStudentPassword.vue
+++ b/web/src/views/ReplaceStudentPassword.vue
@@ -28,7 +28,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import ReplacePasswordForm from '../components/ReplacePasswordForm'
+import ReplacePasswordForm from '@/components/ReplacePasswordForm'
 
 export default {
   name: 'ReplacePassword',
diff --git a/web/src/views/SystemAdministration/Logs.vue b/web/src/views/SystemAdministration/Logs.vue
index 9fe22c5..21a3ae5 100644
--- a/web/src/views/SystemAdministration/Logs.vue
+++ b/web/src/views/SystemAdministration/Logs.vue
@@ -114,12 +114,12 @@
 <script>
 import gql from 'graphql-tag'
 import { format, subDays } from 'date-fns'
-import DateTimePicker from '../../components/ui/DatetimePicker'
+import DateTimePicker from '@/components/ui/DatetimePicker'
 
 import VueJsonPretty from 'vue-json-pretty'
 
 import 'vue-json-pretty/lib/styles.css'
-import DatetimePicker from '../../components/ui/DatetimePicker.vue'
+import DatetimePicker from '@/components/ui/DatetimePicker.vue'
 
 const LOGS_QUERY = gql`
   query ($search: String, $dateIn: String, $dateOut: String, $limit: Int) {
diff --git a/web/src/views/UpdatePassword.vue b/web/src/views/UpdatePassword.vue
index 6acfb83..445808a 100755
--- a/web/src/views/UpdatePassword.vue
+++ b/web/src/views/UpdatePassword.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import UpdatePasswordForm from '../components/UpdatePasswordForm'
+import UpdatePasswordForm from '@/components/UpdatePasswordForm'
 export default {
   name: 'UpdatePassword',
   components: { UpdatePasswordForm }
diff --git a/web/src/views/UseToken.vue b/web/src/views/UseToken.vue
index b775ac7..97d64d5 100755
--- a/web/src/views/UseToken.vue
+++ b/web/src/views/UseToken.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import UseTokenForm from '../components/UseTokenForm'
+import UseTokenForm from '@/components/UseTokenForm'
 export default {
   name: 'UseToken',
   components: { UseTokenForm }
diff --git a/web/src/views/UserInfo.vue b/web/src/views/UserInfo.vue
index 8bb78f9..777d315 100755
--- a/web/src/views/UserInfo.vue
+++ b/web/src/views/UserInfo.vue
@@ -31,8 +31,8 @@
 </template>
 
 <script>
-import UserSelect from '../components/UserSelect'
-import UserTitle from '../components/UserTitle.vue'
+import UserSelect from '@/components/UserSelect'
+import UserTitle from '@/components/UserTitle.vue'
 import VueJsonPretty from 'vue-json-pretty'
 import gql from 'graphql-tag'
 
diff --git a/web/src/views/UserPresence.vue b/web/src/views/UserPresence.vue
index efe2655..97537c6 100644
--- a/web/src/views/UserPresence.vue
+++ b/web/src/views/UserPresence.vue
@@ -268,7 +268,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import Avatar from '../components/Avatar'
+import Avatar from '@/components/Avatar'
 import { debounce } from '../utils/debounce'
 
 export default {
diff --git a/web/src/views/WifiDevices.vue b/web/src/views/WifiDevices.vue
index bd41a69..3956286 100644
--- a/web/src/views/WifiDevices.vue
+++ b/web/src/views/WifiDevices.vue
@@ -85,7 +85,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import WifiDevicesDataTable from '../components/DataTables/WifiDevicesDataTable.vue'
+import WifiDevicesDataTable from '@/components/dataTables/WifiDevicesDataTable.vue'
 
 export default {
   name: 'WifiDevices',
diff --git a/web/src/views/WifiUsers/index.vue b/web/src/views/WifiUsers/index.vue
index 20bb378..c21c698 100644
--- a/web/src/views/WifiUsers/index.vue
+++ b/web/src/views/WifiUsers/index.vue
@@ -73,7 +73,7 @@
 </template>
 <script>
 import gql from 'graphql-tag'
-import WifiUsersDataTable from '../../components/DataTables/WifiUsersDataTable.vue'
+import WifiUsersDataTable from '@/components/dataTables/WifiUsersDataTable.vue'
 
 export default {
   components: { WifiUsersDataTable },
diff --git a/web/src/views/WifiUsers/single.vue b/web/src/views/WifiUsers/single.vue
index 88aa9c5..594eb57 100644
--- a/web/src/views/WifiUsers/single.vue
+++ b/web/src/views/WifiUsers/single.vue
@@ -26,9 +26,9 @@
 <script>
 import gql from 'graphql-tag'
 
-import UserWifiDevicesDataTable from '../../components/DataTables/UserWifiDevicesDataTable.vue'
+import UserWifiDevicesDataTable from '@/components/dataTables/UserWifiDevicesDataTable.vue'
 
-import UserTitle from '../../components/UserTitle.vue'
+import UserTitle from '@/components/UserTitle.vue'
 
 export default {
   components: {