diff --git a/zero.Web.UI/.browserslistrc b/zero.Web.UI/.browserslistrc
deleted file mode 100644
index 214388fe..00000000
--- a/zero.Web.UI/.browserslistrc
+++ /dev/null
@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead
diff --git a/zero.Web.UI/App/vue.config.js b/zero.Web.UI/App/vue.config.js
deleted file mode 100644
index e6ce4fa9..00000000
--- a/zero.Web.UI/App/vue.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//import Vue from 'vue';
-
-//Vue.config.errorHandler = (err, vm, info) =>
-//{
-//  console.error(err);
-//};
-
-//Vue.config.warnHandler = (msg, vm, trace) =>
-//{
-//  console.error(`[zero warn]: ${msg}${trace}`);
-//};
\ No newline at end of file
diff --git a/zero.Web.UI/Setup/setup.js b/zero.Web.UI/Setup/setup.js
index ff9aebd5..10982740 100644
--- a/zero.Web.UI/Setup/setup.js
+++ b/zero.Web.UI/Setup/setup.js
@@ -3,7 +3,7 @@ import Setup from './setup.vue';
 //import 'filter/generic.js'
 //import 'directive/filedrop.js'
 
-import GlobalComponents from 'zero/components/globals.js';
-import Directives from 'zero/directives/globals.js';
+import GlobalComponents from '@zero/components/globals.js';
+import Directives from '@zero/directives/globals.js';
 
 new Vue(Setup).$mount('#application'); 
\ No newline at end of file
diff --git a/zero.Web.UI/Setup/setup.vue b/zero.Web.UI/Setup/setup.vue
index ce90c7d8..054aa3c8 100644
--- a/zero.Web.UI/Setup/setup.vue
+++ b/zero.Web.UI/Setup/setup.vue
@@ -14,7 +14,7 @@
 
 <script>
   import Sass from '../Sass/setup.scss'
-  import UiButton from 'zero/components/buttons/button.vue'
+  import UiButton from '@zero/components/buttons/button.vue'
   import StepUser from './Steps/step-user.vue'
   import StepApplication from './Steps/step-application.vue'
   import StepDatabase from './Steps/step-database.vue'
diff --git a/zero.Web.UI/app.js b/zero.Web.UI/app.js
index ad89afd9..f7882839 100644
--- a/zero.Web.UI/app.js
+++ b/zero.Web.UI/app.js
@@ -1,17 +1,17 @@
 import { createApp } from 'vue';
-import App from 'zero/app';
+import App from '@zero/app.vue';
 
 zero.apps = {
   shared: true
 };
 
-import Router from 'zero/router.config.js';
-import registerComponents from 'zero/components/register';
-import registerDirectives from 'zero/directives/register';
-import registerRenderers from 'zero/renderers/register';
+import Router from '@zero/config/router.config.js';
+import registerComponents from '@zero/components/register.js';
+import registerDirectives from '@zero/directives/register.js';
+import registerRenderers from '@zero/renderers/register.js';
 
-import 'zero/zero.plugins.js';
-//import ZeroPlugin from 'zero/plugin.js';
+//import '@zero/config/zero.plugins.js';
+//import ZeroPlugin from '@zero/plugin.js';
 
 const app = createApp(App);
 app.use(Router);
@@ -20,6 +20,4 @@ registerDirectives(app);
 registerComponents(app);
 registerRenderers(app);
 
-app.mount('#app');
-
-//console.info(ZeroPlugin);
\ No newline at end of file
+app.mount('#app');
\ No newline at end of file
diff --git a/zero.Web.UI/App/app.vue b/zero.Web.UI/app.vue
similarity index 56%
rename from zero.Web.UI/App/app.vue
rename to zero.Web.UI/app.vue
index 8433cd06..ce8715fa 100644
--- a/zero.Web.UI/App/app.vue
+++ b/zero.Web.UI/app.vue
@@ -6,7 +6,7 @@
         <router-view></router-view>
       </div>
       <app-overlays />
-      <!--<app-notifications />-->
+      <app-notifications />
     </template>
     <app-login v-else /> 
   </div>
@@ -14,21 +14,20 @@
 
 
 <script>
-  import '../Sass/app.scss'
-  import AppNavigation from 'zero/navigation.vue'
-  import AppLogin from 'zero/pages/login/login.vue'
-  import AppOverlays from 'zero/components/overlays/overlay-holder.vue'
-  //import AppNotifications from 'zero/components/notifications/notification-holder.vue'
-  import AuthApi from 'zero/services/auth.js';
-  import EventHub from 'zero/services/eventhub';
-  import 'zero/vue.config.js'
-  import 'zero/axios.config.js'
-  import 'zero/zero.config.js'
+  import './sass/app.scss'
+  import AppNavigation from '@zero/navigation.vue'
+  import AppLogin from '@zero/pages/login/login.vue'
+  import AppOverlays from '@zero/components/overlays/overlay-holder.vue'
+  import AppNotifications from '@zero/components/notifications/notification-holder.vue'
+  import AuthApi from '@zero/services/auth.js'
+  import EventHub from '@zero/services/eventhub.js'
+  import '@zero/config/zero.config.js'
+  import '@zero/config/axios.config.js'
 
   export default {
     name: 'app',
 
-    components: { AppNavigation, AppOverlays, AppLogin },
+    components: { AppNavigation, AppOverlays, AppLogin, AppNotifications },
 
     data: () => ({
       isAuthenticated: false
diff --git a/zero.Web.UI/babel.config.js b/zero.Web.UI/babel.config.js
deleted file mode 100644
index e9558405..00000000
--- a/zero.Web.UI/babel.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
diff --git a/zero.Web.UI/App/components/buttons/add-button.vue b/zero.Web.UI/components/buttons/add-button.vue
similarity index 100%
rename from zero.Web.UI/App/components/buttons/add-button.vue
rename to zero.Web.UI/components/buttons/add-button.vue
diff --git a/zero.Web.UI/App/components/buttons/button.vue b/zero.Web.UI/components/buttons/button.vue
similarity index 100%
rename from zero.Web.UI/App/components/buttons/button.vue
rename to zero.Web.UI/components/buttons/button.vue
diff --git a/zero.Web.UI/App/components/buttons/dot-button.vue b/zero.Web.UI/components/buttons/dot-button.vue
similarity index 100%
rename from zero.Web.UI/App/components/buttons/dot-button.vue
rename to zero.Web.UI/components/buttons/dot-button.vue
diff --git a/zero.Web.UI/App/components/buttons/icon-button.vue b/zero.Web.UI/components/buttons/icon-button.vue
similarity index 100%
rename from zero.Web.UI/App/components/buttons/icon-button.vue
rename to zero.Web.UI/components/buttons/icon-button.vue
diff --git a/zero.Web.UI/App/components/buttons/select-button.vue b/zero.Web.UI/components/buttons/select-button.vue
similarity index 96%
rename from zero.Web.UI/App/components/buttons/select-button.vue
rename to zero.Web.UI/components/buttons/select-button.vue
index ac289263..87be3418 100644
--- a/zero.Web.UI/App/components/buttons/select-button.vue
+++ b/zero.Web.UI/components/buttons/select-button.vue
@@ -16,7 +16,7 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media';
+  import MediaApi from '@zero/resources/media.js';
 
   export default {
     name: 'uiSelectButton',
diff --git a/zero.Web.UI/App/components/buttons/state-button.vue b/zero.Web.UI/components/buttons/state-button.vue
similarity index 100%
rename from zero.Web.UI/App/components/buttons/state-button.vue
rename to zero.Web.UI/components/buttons/state-button.vue
diff --git a/zero.Web.UI/App/components/datagrid/datagrid.vue b/zero.Web.UI/components/datagrid/datagrid.vue
similarity index 99%
rename from zero.Web.UI/App/components/datagrid/datagrid.vue
rename to zero.Web.UI/components/datagrid/datagrid.vue
index 8deefa59..321935f7 100644
--- a/zero.Web.UI/App/components/datagrid/datagrid.vue
+++ b/zero.Web.UI/components/datagrid/datagrid.vue
@@ -31,7 +31,7 @@
 
 
 <script>
-  import UiPagination from 'zero/components/pagination.vue';
+  import UiPagination from '@zero/components/pagination.vue';
   import { each as _each, extend as _extend, debounce as _debounce } from 'underscore';
 
   const defaultConfig = {
diff --git a/zero.Web.UI/App/components/date.vue b/zero.Web.UI/components/date.vue
similarity index 95%
rename from zero.Web.UI/App/components/date.vue
rename to zero.Web.UI/components/date.vue
index 8787a6f0..35846ce5 100644
--- a/zero.Web.UI/App/components/date.vue
+++ b/zero.Web.UI/components/date.vue
@@ -5,7 +5,7 @@
 
 <script>
   import dayjs from 'dayjs';
-  import Strings from 'zero/services/strings';
+  import Strings from '@zero/services/strings.js';
 
   export default {
     name: 'uiDate',
diff --git a/zero.Web.UI/App/components/forms/alias.vue b/zero.Web.UI/components/forms/alias.vue
similarity index 98%
rename from zero.Web.UI/App/components/forms/alias.vue
rename to zero.Web.UI/components/forms/alias.vue
index 722c674f..ae3d2787 100644
--- a/zero.Web.UI/App/components/forms/alias.vue
+++ b/zero.Web.UI/components/forms/alias.vue
@@ -10,7 +10,7 @@
 
 <script>
   import { map as _map } from 'underscore';
-  import UtilsApi from 'zero/resources/utils';
+  import UtilsApi from '@zero/resources/utils.js';
 
   export default {
     name: 'uiAlias',
diff --git a/zero.Web.UI/App/components/forms/check-list.vue b/zero.Web.UI/components/forms/check-list.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/check-list.vue
rename to zero.Web.UI/components/forms/check-list.vue
diff --git a/zero.Web.UI/App/components/forms/error-view.vue b/zero.Web.UI/components/forms/error-view.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/error-view.vue
rename to zero.Web.UI/components/forms/error-view.vue
diff --git a/zero.Web.UI/App/components/forms/error.vue b/zero.Web.UI/components/forms/error.vue
similarity index 96%
rename from zero.Web.UI/App/components/forms/error.vue
rename to zero.Web.UI/components/forms/error.vue
index aded7dfb..7377f2ce 100644
--- a/zero.Web.UI/App/components/forms/error.vue
+++ b/zero.Web.UI/components/forms/error.vue
@@ -7,7 +7,7 @@
 
 <script>
   import { isArray as _isArray } from 'underscore'
-  import Strings from 'zero/services/strings'
+  import Strings from '@zero/services/strings.js'
 
   export default {
     name: 'uiError',
diff --git a/zero.Web.UI/App/components/forms/form-header.vue b/zero.Web.UI/components/forms/form-header.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/form-header.vue
rename to zero.Web.UI/components/forms/form-header.vue
diff --git a/zero.Web.UI/App/components/forms/form.vue b/zero.Web.UI/components/forms/form.vue
similarity index 99%
rename from zero.Web.UI/App/components/forms/form.vue
rename to zero.Web.UI/components/forms/form.vue
index 4c5b22ca..23c8f885 100644
--- a/zero.Web.UI/App/components/forms/form.vue
+++ b/zero.Web.UI/components/forms/form.vue
@@ -10,8 +10,8 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay.js'
-  import Notification from 'zero/services/notification.js'
+  import Overlay from '@zero/services/overlay.js'
+  import Notification from '@zero/services/notification.js'
   import { isArray as _isArray, filter as _filter, groupBy as _groupBy, each as _each, difference as _difference } from 'underscore'
 
   export default {
diff --git a/zero.Web.UI/App/components/forms/input-list.vue b/zero.Web.UI/components/forms/input-list.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/input-list.vue
rename to zero.Web.UI/components/forms/input-list.vue
diff --git a/zero.Web.UI/App/components/forms/media-old.vue b/zero.Web.UI/components/forms/media-old.vue
similarity index 98%
rename from zero.Web.UI/App/components/forms/media-old.vue
rename to zero.Web.UI/components/forms/media-old.vue
index 9e42dee5..ecc4937d 100644
--- a/zero.Web.UI/App/components/forms/media-old.vue
+++ b/zero.Web.UI/components/forms/media-old.vue
@@ -26,9 +26,9 @@
 
 <script>
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
-  import Strings from 'zero/services/strings.js';
-  import Overlay from 'zero/services/overlay.js';
-  import MediaOverlay from 'zero/pages/media/media-item';
+  import Strings from '@zero/services/strings.js';
+  import Overlay from '@zero/services/overlay.js';
+  import MediaOverlay from '@zero/pages/media/media-item.vue';
 
   const TYPES = {
     ALL: 'all',
diff --git a/zero.Web.UI/App/components/forms/property.vue b/zero.Web.UI/components/forms/property.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/property.vue
rename to zero.Web.UI/components/forms/property.vue
diff --git a/zero.Web.UI/App/components/forms/rte.pell.dependency.js b/zero.Web.UI/components/forms/rte.pell.dependency.js
similarity index 100%
rename from zero.Web.UI/App/components/forms/rte.pell.dependency.js
rename to zero.Web.UI/components/forms/rte.pell.dependency.js
diff --git a/zero.Web.UI/App/components/forms/rte.vue b/zero.Web.UI/components/forms/rte.vue
similarity index 98%
rename from zero.Web.UI/App/components/forms/rte.vue
rename to zero.Web.UI/components/forms/rte.vue
index 431b7846..9c71ae5c 100644
--- a/zero.Web.UI/App/components/forms/rte.vue
+++ b/zero.Web.UI/components/forms/rte.vue
@@ -13,7 +13,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from '@zero/services/strings.js';
   import Pell from './rte.pell.dependency.js';
 
   export default {
diff --git a/zero.Web.UI/App/components/forms/search.vue b/zero.Web.UI/components/forms/search.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/search.vue
rename to zero.Web.UI/components/forms/search.vue
diff --git a/zero.Web.UI/App/components/forms/tags.vue b/zero.Web.UI/components/forms/tags.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/tags.vue
rename to zero.Web.UI/components/forms/tags.vue
diff --git a/zero.Web.UI/App/components/forms/toggle.vue b/zero.Web.UI/components/forms/toggle.vue
similarity index 100%
rename from zero.Web.UI/App/components/forms/toggle.vue
rename to zero.Web.UI/components/forms/toggle.vue
diff --git a/zero.Web.UI/App/components/header-bar.vue b/zero.Web.UI/components/header-bar.vue
similarity index 98%
rename from zero.Web.UI/App/components/header-bar.vue
rename to zero.Web.UI/components/header-bar.vue
index 2761b69b..1ae17890 100644
--- a/zero.Web.UI/App/components/header-bar.vue
+++ b/zero.Web.UI/components/header-bar.vue
@@ -25,7 +25,7 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
     name: 'uiHeaderBar',
diff --git a/zero.Web.UI/App/components/loading.vue b/zero.Web.UI/components/loading.vue
similarity index 100%
rename from zero.Web.UI/App/components/loading.vue
rename to zero.Web.UI/components/loading.vue
diff --git a/zero.Web.UI/App/components/messages/message.vue b/zero.Web.UI/components/messages/message.vue
similarity index 100%
rename from zero.Web.UI/App/components/messages/message.vue
rename to zero.Web.UI/components/messages/message.vue
diff --git a/zero.Web.UI/App/components/modules/edit-module.vue b/zero.Web.UI/components/modules/edit-module.vue
similarity index 95%
rename from zero.Web.UI/App/components/modules/edit-module.vue
rename to zero.Web.UI/components/modules/edit-module.vue
index e840b857..286a0b6c 100644
--- a/zero.Web.UI/App/components/modules/edit-module.vue
+++ b/zero.Web.UI/components/modules/edit-module.vue
@@ -23,8 +23,8 @@
 
 
 <script>
-  import ModulesApi from 'zero/resources/modules.js';
-  import UiEditor from 'zero/editor/editor';
+  import ModulesApi from '@zero/resources/modules.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/components/modules/module-preview-inner.vue b/zero.Web.UI/components/modules/module-preview-inner.vue
similarity index 100%
rename from zero.Web.UI/App/components/modules/module-preview-inner.vue
rename to zero.Web.UI/components/modules/module-preview-inner.vue
diff --git a/zero.Web.UI/App/components/modules/module-preview.vue b/zero.Web.UI/components/modules/module-preview.vue
similarity index 100%
rename from zero.Web.UI/App/components/modules/module-preview.vue
rename to zero.Web.UI/components/modules/module-preview.vue
diff --git a/zero.Web.UI/App/components/modules/modules-select.vue b/zero.Web.UI/components/modules/modules-select.vue
similarity index 98%
rename from zero.Web.UI/App/components/modules/modules-select.vue
rename to zero.Web.UI/components/modules/modules-select.vue
index 4385736d..b24bf356 100644
--- a/zero.Web.UI/App/components/modules/modules-select.vue
+++ b/zero.Web.UI/components/modules/modules-select.vue
@@ -31,7 +31,7 @@
 
 <script>
   import { groupBy as _groupBy, keys as _keys, each as _each } from 'underscore';
-  import Notification from 'zero/services/notification';
+  import Notification from '@zero/services/notification.js';
 
   export default {
     name: 'uiModulesSelect',
diff --git a/zero.Web.UI/App/components/modules/modules.vue b/zero.Web.UI/components/modules/modules.vue
similarity index 93%
rename from zero.Web.UI/App/components/modules/modules.vue
rename to zero.Web.UI/components/modules/modules.vue
index 98a487b8..dcc211c3 100644
--- a/zero.Web.UI/App/components/modules/modules.vue
+++ b/zero.Web.UI/components/modules/modules.vue
@@ -9,10 +9,10 @@
 
 
 <script>
-  import ModulesApi from 'zero/resources/modules.js';
-  import EditModuleOverlay from './edit-module';
-  import Overlay from 'zero/services/overlay.js';
-  import Arrays from 'zero/services/arrays.js';
+  import ModulesApi from '@zero/resources/modules.js';
+  import EditModuleOverlay from './edit-module.vue';
+  import Overlay from '@zero/services/overlay.js';
+  import Arrays from '@zero/services/arrays.js';
 
   export default {
     name: 'uiModules',
diff --git a/zero.Web.UI/App/components/modules/predefined/module-preview-figure.vue b/zero.Web.UI/components/modules/predefined/module-preview-figure.vue
similarity index 97%
rename from zero.Web.UI/App/components/modules/predefined/module-preview-figure.vue
rename to zero.Web.UI/components/modules/predefined/module-preview-figure.vue
index cb966e05..50f82acb 100644
--- a/zero.Web.UI/App/components/modules/predefined/module-preview-figure.vue
+++ b/zero.Web.UI/components/modules/predefined/module-preview-figure.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-  import MediaApi from 'zero/resources/media.js'
+  import MediaApi from '@zero/resources/media.js'
 
 
   export default {
diff --git a/zero.Web.UI/App/components/modules/predefined/module-preview-headline.vue b/zero.Web.UI/components/modules/predefined/module-preview-headline.vue
similarity index 100%
rename from zero.Web.UI/App/components/modules/predefined/module-preview-headline.vue
rename to zero.Web.UI/components/modules/predefined/module-preview-headline.vue
diff --git a/zero.Web.UI/App/components/modules/predefined/module-preview-text.vue b/zero.Web.UI/components/modules/predefined/module-preview-text.vue
similarity index 100%
rename from zero.Web.UI/App/components/modules/predefined/module-preview-text.vue
rename to zero.Web.UI/components/modules/predefined/module-preview-text.vue
diff --git a/zero.Web.UI/App/components/notifications/notification-holder.vue b/zero.Web.UI/components/notifications/notification-holder.vue
similarity index 95%
rename from zero.Web.UI/App/components/notifications/notification-holder.vue
rename to zero.Web.UI/components/notifications/notification-holder.vue
index 3ed1877f..c53be4e5 100644
--- a/zero.Web.UI/App/components/notifications/notification-holder.vue
+++ b/zero.Web.UI/components/notifications/notification-holder.vue
@@ -14,11 +14,11 @@
 
 
 <script>
-  import Notification from 'zero/services/notification.js'
+  //import Notification from '@zero/services/notification.js'
 
   export default {
     data: () => ({
-      instances: Notification.instances
+      instances: [] //Notification.instances
     }),
 
     methods: {
diff --git a/zero.Web.UI/App/components/overlays/confirm.vue b/zero.Web.UI/components/overlays/confirm.vue
similarity index 100%
rename from zero.Web.UI/App/components/overlays/confirm.vue
rename to zero.Web.UI/components/overlays/confirm.vue
diff --git a/zero.Web.UI/App/components/overlays/dropdown-button.vue b/zero.Web.UI/components/overlays/dropdown-button.vue
similarity index 99%
rename from zero.Web.UI/App/components/overlays/dropdown-button.vue
rename to zero.Web.UI/components/overlays/dropdown-button.vue
index 8c19fe09..964fe653 100644
--- a/zero.Web.UI/App/components/overlays/dropdown-button.vue
+++ b/zero.Web.UI/components/overlays/dropdown-button.vue
@@ -15,7 +15,7 @@
 
 
 <script>
-  import { warn } from 'zero/services/debug';
+  import { warn } from '@zero/services/debug.js';
 
   export default {
     name: 'uiDropdownButton',
diff --git a/zero.Web.UI/App/components/overlays/dropdown-separator.vue b/zero.Web.UI/components/overlays/dropdown-separator.vue
similarity index 100%
rename from zero.Web.UI/App/components/overlays/dropdown-separator.vue
rename to zero.Web.UI/components/overlays/dropdown-separator.vue
diff --git a/zero.Web.UI/App/components/overlays/dropdown.vue b/zero.Web.UI/components/overlays/dropdown.vue
similarity index 97%
rename from zero.Web.UI/App/components/overlays/dropdown.vue
rename to zero.Web.UI/components/overlays/dropdown.vue
index c1a288d0..280444d3 100644
--- a/zero.Web.UI/App/components/overlays/dropdown.vue
+++ b/zero.Web.UI/components/overlays/dropdown.vue
@@ -11,7 +11,7 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
     name: 'uiDropdown',
diff --git a/zero.Web.UI/App/components/overlays/overlay-editor.vue b/zero.Web.UI/components/overlays/overlay-editor.vue
similarity index 100%
rename from zero.Web.UI/App/components/overlays/overlay-editor.vue
rename to zero.Web.UI/components/overlays/overlay-editor.vue
diff --git a/zero.Web.UI/App/components/overlays/overlay-holder.vue b/zero.Web.UI/components/overlays/overlay-holder.vue
similarity index 95%
rename from zero.Web.UI/App/components/overlays/overlay-holder.vue
rename to zero.Web.UI/components/overlays/overlay-holder.vue
index 112e1753..3df9ef15 100644
--- a/zero.Web.UI/App/components/overlays/overlay-holder.vue
+++ b/zero.Web.UI/components/overlays/overlay-holder.vue
@@ -4,7 +4,7 @@
       <div class="app-overlay-outer" :display="instance.display" v-for="(instance, index) in instances" :key="instance.id" :style="{ transform: instance.display !== 'editor' ? null : 'translateX(' + (editorLength - index - 1) * -60 + 'px)' }">
         <div class="app-overlay-bg" @click="close(instance)"></div>
         <dialog open class="app-overlay" :style="{ width: instance.width + 'px' }" :class="'theme-' + instance.theme" :display="instance.display">
-          <component :is="instance.component" :model.sync="instance.model" :config="instance"></component>
+          <component :is="instance.component" v-model:model="instance.model" :config="instance"></component>
         </dialog>
       </div>
     </transition-group>
@@ -13,7 +13,7 @@
 
 
 <script>
-  import EventHub from 'zero/services/eventhub';
+  import EventHub from '@zero/services/eventhub.js';
   import { filter as _filter } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/pagination.vue b/zero.Web.UI/components/pagination.vue
similarity index 100%
rename from zero.Web.UI/App/components/pagination.vue
rename to zero.Web.UI/components/pagination.vue
diff --git a/zero.Web.UI/App/components/permissions.vue b/zero.Web.UI/components/permissions.vue
similarity index 98%
rename from zero.Web.UI/App/components/permissions.vue
rename to zero.Web.UI/components/permissions.vue
index afd88315..b98eeda8 100644
--- a/zero.Web.UI/App/components/permissions.vue
+++ b/zero.Web.UI/components/permissions.vue
@@ -18,7 +18,7 @@
 
 
 <script>
-  import UserRolesApi from 'zero/resources/userRoles';
+  import UserRolesApi from '@zero/resources/userRoles.js';
   import { filter as _filter } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue b/zero.Web.UI/components/pickers/colorPicker/colorpicker.vue
similarity index 97%
rename from zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue
rename to zero.Web.UI/components/pickers/colorPicker/colorpicker.vue
index 7c2c4f86..e1d7d274 100644
--- a/zero.Web.UI/App/components/pickers/colorPicker/colorpicker.vue
+++ b/zero.Web.UI/components/pickers/colorPicker/colorpicker.vue
@@ -10,7 +10,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from '@zero/services/strings.js';
   import { extend as _extend } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue b/zero.Web.UI/components/pickers/countryPicker/countrypicker.vue
similarity index 90%
rename from zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue
rename to zero.Web.UI/components/pickers/countryPicker/countrypicker.vue
index 2fe21265..903b471e 100644
--- a/zero.Web.UI/App/components/pickers/countryPicker/countrypicker.vue
+++ b/zero.Web.UI/components/pickers/countryPicker/countrypicker.vue
@@ -6,8 +6,8 @@
 
 
 <script>
-  import CountriesApi from 'zero/resources/countries.js'
-  import { extend as _extend } from 'deps/underscore'
+  import CountriesApi from '@zero/resources/countries.js'
+  import { extend as _extend } from 'underscore'
 
   export default {
     name: 'uiCountrypicker',
diff --git a/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue b/zero.Web.UI/components/pickers/datePicker/datepicker.vue
similarity index 97%
rename from zero.Web.UI/App/components/pickers/datePicker/datepicker.vue
rename to zero.Web.UI/components/pickers/datePicker/datepicker.vue
index 177f28c9..813503d7 100644
--- a/zero.Web.UI/App/components/pickers/datePicker/datepicker.vue
+++ b/zero.Web.UI/components/pickers/datePicker/datepicker.vue
@@ -12,8 +12,8 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
-  import DatepickerOverlay from './overlay';
+  import Strings from '@zero/services/strings.js';
+  import DatepickerOverlay from './overlay.vue';
   import { extend as _extend } from 'underscore';
   import dayjs from 'dayjs';
 
diff --git a/zero.Web.UI/App/components/pickers/datePicker/overlay.vue b/zero.Web.UI/components/pickers/datePicker/overlay.vue
similarity index 100%
rename from zero.Web.UI/App/components/pickers/datePicker/overlay.vue
rename to zero.Web.UI/components/pickers/datePicker/overlay.vue
diff --git a/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue b/zero.Web.UI/components/pickers/dateRangePicker/daterangepicker.vue
similarity index 95%
rename from zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue
rename to zero.Web.UI/components/pickers/dateRangePicker/daterangepicker.vue
index b2946d93..f1053b14 100644
--- a/zero.Web.UI/App/components/pickers/dateRangePicker/daterangepicker.vue
+++ b/zero.Web.UI/components/pickers/dateRangePicker/daterangepicker.vue
@@ -20,10 +20,10 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from '@zero/services/strings.js';
   import { extend as _extend } from 'underscore';
-  import DaterangepickerOverlay from './overlay';
-  import Overlay from 'zero/services/overlay.js';
+  import DaterangepickerOverlay from './overlay.vue';
+  import Overlay from '@zero/services/overlay.js';
   import dayjs from 'dayjs';
 
   const DATETIME_FORMAT = 'DD.MM.YY HH:mm';
diff --git a/zero.Web.UI/App/components/pickers/dateRangePicker/overlay.vue b/zero.Web.UI/components/pickers/dateRangePicker/overlay.vue
similarity index 100%
rename from zero.Web.UI/App/components/pickers/dateRangePicker/overlay.vue
rename to zero.Web.UI/components/pickers/dateRangePicker/overlay.vue
diff --git a/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue b/zero.Web.UI/components/pickers/iconPicker/iconpicker.vue
similarity index 98%
rename from zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue
rename to zero.Web.UI/components/pickers/iconPicker/iconpicker.vue
index 29715af2..9a9a710b 100644
--- a/zero.Web.UI/App/components/pickers/iconPicker/iconpicker.vue
+++ b/zero.Web.UI/components/pickers/iconPicker/iconpicker.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import PickIconOverlay from './overlay';
-  import Overlay from 'zero/services/overlay';
+  import PickIconOverlay from './overlay.vue';
+  import Overlay from '@zero/services/overlay.js';
   import { extend as _extend } from 'underscore';
 
   const FEATHER_ICONS = ['fth-alert-octagon','fth-alert-circle','fth-activity','fth-alert-triangle','fth-align-center','fth-airplay','fth-align-justify','fth-align-left','fth-align-right','fth-arrow-down-left','fth-arrow-down-right','fth-anchor','fth-aperture','fth-arrow-left','fth-arrow-right','fth-arrow-down','fth-arrow-up-left','fth-arrow-up-right','fth-arrow-up','fth-award','fth-bar-chart','fth-at-sign','fth-bar-chart-2','fth-battery-charging','fth-bell-off','fth-battery','fth-bluetooth','fth-bell','fth-book','fth-briefcase','fth-camera-off','fth-calendar','fth-bookmark','fth-box','fth-camera','fth-check-circle','fth-check','fth-check-square','fth-cast','fth-chevron-down','fth-chevron-left','fth-chevron-right','fth-chevron-up','fth-chevrons-down','fth-chevrons-right','fth-chevrons-up','fth-chevrons-left','fth-circle','fth-clipboard','fth-chrome','fth-clock','fth-cloud-lightning','fth-cloud-drizzle','fth-cloud-rain','fth-cloud-off','fth-codepen','fth-cloud-snow','fth-compass','fth-copy','fth-corner-down-right','fth-corner-down-left','fth-corner-left-down','fth-corner-left-up','fth-corner-up-left','fth-corner-up-right','fth-corner-right-down','fth-corner-right-up','fth-cpu','fth-credit-card','fth-crosshair','fth-disc','fth-delete','fth-download-cloud','fth-download','fth-droplet','fth-edit-2','fth-edit','fth-edit-1','fth-external-link','fth-eye','fth-feather','fth-facebook','fth-file-minus','fth-eye-off','fth-fast-forward','fth-file-text','fth-film','fth-file','fth-file-plus','fth-folder','fth-filter','fth-flag','fth-globe','fth-grid','fth-heart','fth-home','fth-github','fth-image','fth-inbox','fth-layers','fth-info','fth-instagram','fth-layout','fth-link-2','fth-life-buoy','fth-link','fth-log-in','fth-list','fth-lock','fth-log-out','fth-loader','fth-mail','fth-maximize-2','fth-map','fth-map-pin','fth-menu','fth-message-circle','fth-message-square','fth-minimize-2','fth-mic-off','fth-minus-circle','fth-mic','fth-minus-square','fth-minus','fth-moon','fth-monitor','fth-more-vertical','fth-more-horizontal','fth-move','fth-music','fth-navigation-2','fth-navigation','fth-octagon','fth-package','fth-pause-circle','fth-pause','fth-percent','fth-phone-call','fth-phone-forwarded','fth-phone-missed','fth-phone-off','fth-phone-incoming','fth-phone','fth-phone-outgoing','fth-pie-chart','fth-play-circle','fth-play','fth-plus-square','fth-plus-circle','fth-plus','fth-pocket','fth-printer','fth-power','fth-radio','fth-repeat','fth-refresh-ccw','fth-rewind','fth-rotate-ccw','fth-refresh-cw','fth-rotate-cw','fth-save','fth-search','fth-server','fth-scissors','fth-share-2','fth-share','fth-shield','fth-settings','fth-skip-back','fth-shuffle','fth-sidebar','fth-skip-forward','fth-slack','fth-slash','fth-smartphone','fth-square','fth-speaker','fth-star','fth-stop-circle','fth-sun','fth-sunrise','fth-tablet','fth-tag','fth-sunset','fth-target','fth-thermometer','fth-thumbs-up','fth-thumbs-down','fth-toggle-left','fth-toggle-right','fth-trash-2','fth-trash','fth-trending-up','fth-trending-down','fth-triangle','fth-type','fth-twitter','fth-upload','fth-umbrella','fth-upload-cloud','fth-unlock','fth-user-check','fth-user-minus','fth-user-plus','fth-user-x','fth-user','fth-users','fth-video-off','fth-video','fth-voicemail','fth-volume-x','fth-volume-2','fth-volume-1','fth-volume','fth-watch','fth-wifi','fth-x-square','fth-wind','fth-x','fth-x-circle','fth-zap','fth-zoom-in','fth-zoom-out','fth-command','fth-cloud','fth-hash','fth-headphones','fth-underline','fth-italic','fth-bold','fth-crop','fth-help-circle','fth-paperclip','fth-shopping-cart','fth-tv','fth-wifi-off','fth-minimize','fth-maximize','fth-gitlab','fth-sliders','fth-star-on','fth-heart-on','fth-archive','fth-arrow-down-circle','fth-arrow-up-circle','fth-arrow-left-circle','fth-arrow-right-circle','fth-bar-chart-line-','fth-bar-chart-line','fth-book-open','fth-code','fth-database','fth-dollar-sign','fth-folder-plus','fth-gift','fth-folder-minus','fth-git-commit','fth-git-branch','fth-git-pull-request','fth-git-merge','fth-linkedin','fth-hard-drive','fth-more-vertical','fth-more-horizontal','fth-rss','fth-send','fth-shield-off','fth-shopping-bag','fth-terminal','fth-truck','fth-zap-off','fth-youtube','fth-google'];
diff --git a/zero.Web.UI/App/components/pickers/iconPicker/overlay.vue b/zero.Web.UI/components/pickers/iconPicker/overlay.vue
similarity index 100%
rename from zero.Web.UI/App/components/pickers/iconPicker/overlay.vue
rename to zero.Web.UI/components/pickers/iconPicker/overlay.vue
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue b/zero.Web.UI/components/pickers/mediaPicker/mediapicker.vue
similarity index 97%
rename from zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
rename to zero.Web.UI/components/pickers/mediaPicker/mediapicker.vue
index ed8139d5..e7296de2 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
+++ b/zero.Web.UI/components/pickers/mediaPicker/mediapicker.vue
@@ -25,11 +25,11 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media.js'
-  import PickMediaOverlay from './overlay';
-  import Overlay from 'zero/services/overlay';
+  import MediaApi from '@zero/resources/media.js'
+  import PickMediaOverlay from './overlay.vue';
+  import Overlay from '@zero/services/overlay.js';
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
-  import Strings from 'zero/services/strings.js';
+  import Strings from '@zero/services/strings.js';
 
   const TYPES = {
     ALL: 'all',
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue b/zero.Web.UI/components/pickers/mediaPicker/overlay.vue
similarity index 95%
rename from zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
rename to zero.Web.UI/components/pickers/mediaPicker/overlay.vue
index 1bf791fc..4fe5ee15 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
+++ b/zero.Web.UI/components/pickers/mediaPicker/overlay.vue
@@ -38,11 +38,11 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media.js'
-  import MediaFolderApi from 'zero/resources/media-folder.js';
-  import Overlay from 'zero/services/overlay.js'
-  import AddFolderOverlay from 'zero/pages/media/overlays/folder'
-  import UploadStatusOverlay from 'zero/pages/media/overlays/upload-status'
+  import MediaApi from '@zero/resources/media.js'
+  import MediaFolderApi from '@zero/resources/media-folder.js';
+  import Overlay from '@zero/services/overlay.js'
+  import AddFolderOverlay from '@zero/pages/media/overlays/folder.vue'
+  import UploadStatusOverlay from '@zero/pages/media/overlays/upload-status.vue'
   import { debounce as _debounce, filter as _filter } from 'underscore'
 
   export default {
diff --git a/zero.Web.UI/App/components/pickers/pick.vue b/zero.Web.UI/components/pickers/pick.vue
similarity index 100%
rename from zero.Web.UI/App/components/pickers/pick.vue
rename to zero.Web.UI/components/pickers/pick.vue
diff --git a/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue b/zero.Web.UI/components/pickers/userPicker/userpicker.vue
similarity index 92%
rename from zero.Web.UI/App/components/pickers/userPicker/userpicker.vue
rename to zero.Web.UI/components/pickers/userPicker/userpicker.vue
index 11b45113..20baab96 100644
--- a/zero.Web.UI/App/components/pickers/userPicker/userpicker.vue
+++ b/zero.Web.UI/components/pickers/userPicker/userpicker.vue
@@ -6,8 +6,8 @@
 
 
 <script>
-  import UsersApi from 'zero/resources/users.js'
-  import { extend as _extend } from 'deps/underscore'
+  import UsersApi from '@zero/resources/users.js'
+  import { extend as _extend } from 'underscore'
 
   export default {
     name: 'uiUserpicker',
diff --git a/zero.Web.UI/App/components/register.js b/zero.Web.UI/components/register.js
similarity index 100%
rename from zero.Web.UI/App/components/register.js
rename to zero.Web.UI/components/register.js
diff --git a/zero.Web.UI/App/components/revisions.vue b/zero.Web.UI/components/revisions.vue
similarity index 96%
rename from zero.Web.UI/App/components/revisions.vue
rename to zero.Web.UI/components/revisions.vue
index 9c9d6d18..378dfa25 100644
--- a/zero.Web.UI/App/components/revisions.vue
+++ b/zero.Web.UI/components/revisions.vue
@@ -17,8 +17,8 @@
 
 <script>
   import dayjs from 'dayjs';
-  import Strings from 'zero/services/strings';
-  import MediaApi from 'zero/resources/media.js';
+  import Strings from '@zero/services/strings.js';
+  import MediaApi from '@zero/resources/media.js';
 
   export default {
     name: 'uiRevisions',
diff --git a/zero.Web.UI/App/components/tables/table-filter-overlay.vue b/zero.Web.UI/components/tables/table-filter-overlay.vue
similarity index 97%
rename from zero.Web.UI/App/components/tables/table-filter-overlay.vue
rename to zero.Web.UI/components/tables/table-filter-overlay.vue
index 4006d451..7efce8e0 100644
--- a/zero.Web.UI/App/components/tables/table-filter-overlay.vue
+++ b/zero.Web.UI/components/tables/table-filter-overlay.vue
@@ -44,8 +44,8 @@
 
 
 <script>
-  import EditorComponent from 'zero/editor/editor-component';
-  import { find as _find } from 'deps/underscore';
+  import EditorComponent from '@zero/editor/editor-component.vue';
+  import { find as _find } from 'underscore';
 
   export default {
 
diff --git a/zero.Web.UI/App/components/tables/table-filter.vue b/zero.Web.UI/components/tables/table-filter.vue
similarity index 97%
rename from zero.Web.UI/App/components/tables/table-filter.vue
rename to zero.Web.UI/components/tables/table-filter.vue
index adcf9221..1f95e3d6 100644
--- a/zero.Web.UI/App/components/tables/table-filter.vue
+++ b/zero.Web.UI/components/tables/table-filter.vue
@@ -29,9 +29,9 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay';
-  import Strings from 'zero/services/strings';
-  import FilterOverlay from './table-filter-overlay';
+  import Overlay from '@zero/services/overlay.js';
+  import Strings from '@zero/services/strings.js';
+  import FilterOverlay from './table-filter-overlay.vue';
   import { isArray as _isArray } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/components/tables/table-value.js b/zero.Web.UI/components/tables/table-value.js
similarity index 92%
rename from zero.Web.UI/App/components/tables/table-value.js
rename to zero.Web.UI/components/tables/table-value.js
index 5e77702c..62c18a72 100644
--- a/zero.Web.UI/App/components/tables/table-value.js
+++ b/zero.Web.UI/components/tables/table-value.js
@@ -1,7 +1,7 @@
-import { warn } from 'zero/services/debug';
-import MediaApi from 'zero/resources/media';
-import Strings from 'zero/services/strings';
-import Localization from 'zero/services/localization';
+import { warn } from '@zero/services/debug.js';
+import MediaApi from '@zero/resources/media.js';
+import Strings from '@zero/services/strings.js';
+import Localization from '@zero/services/localization.js';
 
 export default function (el, binding)
 {
diff --git a/zero.Web.UI/App/components/tables/table.vue b/zero.Web.UI/components/tables/table.vue
similarity index 99%
rename from zero.Web.UI/App/components/tables/table.vue
rename to zero.Web.UI/components/tables/table.vue
index 16324675..13b74ce0 100644
--- a/zero.Web.UI/App/components/tables/table.vue
+++ b/zero.Web.UI/components/tables/table.vue
@@ -41,7 +41,7 @@
 
 <script>
   import TableValueDirective from './table-value.js';
-  import UiPagination from 'zero/components/pagination.vue';
+  import UiPagination from '@zero/components/pagination.vue';
   import { each as _each, extend as _extend, debounce as _debounce } from 'underscore';
 
   const defaultConfig = {
diff --git a/zero.Web.UI/App/components/tabs/inline-tabs.vue b/zero.Web.UI/components/tabs/inline-tabs.vue
similarity index 100%
rename from zero.Web.UI/App/components/tabs/inline-tabs.vue
rename to zero.Web.UI/components/tabs/inline-tabs.vue
diff --git a/zero.Web.UI/App/components/tabs/tab.vue b/zero.Web.UI/components/tabs/tab.vue
similarity index 95%
rename from zero.Web.UI/App/components/tabs/tab.vue
rename to zero.Web.UI/components/tabs/tab.vue
index 198e3ecb..ab10af1a 100644
--- a/zero.Web.UI/App/components/tabs/tab.vue
+++ b/zero.Web.UI/components/tabs/tab.vue
@@ -6,7 +6,7 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
+  import Strings from '@zero/services/strings.js';
 
   export default {
     name: 'uiTab',
diff --git a/zero.Web.UI/App/components/tabs/tabs.vue b/zero.Web.UI/components/tabs/tabs.vue
similarity index 100%
rename from zero.Web.UI/App/components/tabs/tabs.vue
rename to zero.Web.UI/components/tabs/tabs.vue
diff --git a/zero.Web.UI/App/components/tree/tree-item.vue b/zero.Web.UI/components/tree/tree-item.vue
similarity index 100%
rename from zero.Web.UI/App/components/tree/tree-item.vue
rename to zero.Web.UI/components/tree/tree-item.vue
diff --git a/zero.Web.UI/App/components/tree/tree.vue b/zero.Web.UI/components/tree/tree.vue
similarity index 100%
rename from zero.Web.UI/App/components/tree/tree.vue
rename to zero.Web.UI/components/tree/tree.vue
diff --git a/zero.Web.UI/vue.config.js b/zero.Web.UI/config/_vue.config.js
similarity index 97%
rename from zero.Web.UI/vue.config.js
rename to zero.Web.UI/config/_vue.config.js
index c96b5974..6a3cc6f2 100644
--- a/zero.Web.UI/vue.config.js
+++ b/zero.Web.UI/config/_vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
 
   // generated output
   pages: {
-    app: "app.js"
+    app: "App/app.js"
   },
 
   // webpack configuration
diff --git a/zero.Web.UI/App/plugin.js b/zero.Web.UI/config/app.plugin.js
similarity index 72%
rename from zero.Web.UI/App/plugin.js
rename to zero.Web.UI/config/app.plugin.js
index 7d95193f..d4ad2f06 100644
--- a/zero.Web.UI/App/plugin.js
+++ b/zero.Web.UI/config/app.plugin.js
@@ -1,5 +1,5 @@
-import Plugin from 'zero/core/plugin';
-
+
+import Plugin from '@zero/core/plugin.js';
 
 let plugin = new Plugin('zero');
 
diff --git a/zero.Web.UI/App/axios.config.js b/zero.Web.UI/config/axios.config.js
similarity index 83%
rename from zero.Web.UI/App/axios.config.js
rename to zero.Web.UI/config/axios.config.js
index c721f021..15843ff8 100644
--- a/zero.Web.UI/App/axios.config.js
+++ b/zero.Web.UI/config/axios.config.js
@@ -1,5 +1,6 @@
-import Axios from 'axios';
-import Auth from 'zero/services/auth';
+
+import Auth from '@zero/services/auth.js';
+import Axios from 'axios';
 import Qs from 'qs';
 
 if (!zero || !zero.apiPath)
@@ -12,7 +13,7 @@ Axios.defaults.withCredentials = true;
 
 Axios.defaults.paramsSerializer = (params) =>
 {
-  return Qs.stringify(params, { allowDots: true });
+  return stringify(params, { allowDots: true });
 };
 
 Axios.interceptors.response.use(response => response, error =>
diff --git a/zero.Web.UI/App/router.config.js b/zero.Web.UI/config/router.config.js
similarity index 82%
rename from zero.Web.UI/App/router.config.js
rename to zero.Web.UI/config/router.config.js
index c7ce0b00..4df255e0 100644
--- a/zero.Web.UI/App/router.config.js
+++ b/zero.Web.UI/config/router.config.js
@@ -1,7 +1,8 @@
-import { createRouter, createWebHistory } from "vue-router";
-import Localization from 'zero/services/localization';
+
+import { createRouter, createWebHistory } from "vue-router";
+import Localization from '@zero/services/localization.js';
 import { isArray as _isArray, find as _find, map as _map, filter as _filter } from 'underscore';
-import { warn } from 'zero/services/debug';
+import { warn } from '@zero/services/debug.js';
 
 const routes = [];
 
@@ -31,13 +32,13 @@ zero.sections.forEach(section =>
 {
   if (!section.isExternal)
   {
-    addSection(section, () => import('zero/pages/' + section.alias + '/' + section.alias));
+    addSection(section, () => import('@zero/pages/' + section.alias + '/' + section.alias));
 
     if (section.children.length > 0)
     {
       section.children.forEach(child =>
       {
-        addSection(child, () => import('zero/pages/' + section.alias + '/' + section.alias + '/' + child.alias), section);
+        addSection(child, () => import('@zero/pages/' + section.alias + '/' + section.alias + '/' + child.alias), section);
       });
     }
   }
@@ -48,7 +49,7 @@ zero.sections.forEach(section =>
 
 routes.push({
   path: '/preview',
-  component: () => import('zero/pages/preview'),
+  component: () => import('@zero/pages/preview'),
   name: 'preview',
   meta: {
     name: '@preview.name'
@@ -101,17 +102,17 @@ let addRoutesPerContext = (context, isPlugin) =>
 
 
 // add internal route extensions
-addRoutesPerContext(require.context('zero/pages', true, /routes\.js$/));
+//addRoutesPerContext(require.context('zero/pages', true, /routes\.js$/));
 
 // add plugin route extensions
-try
-{
-  addRoutesPerContext(require.context('@/../zero.Commerce/Plugins/zero.Commerce', true, /routes\.js$/), true); // TODO dynPATH
-}
-catch (exc)
-{
-  // TODO error will throw when user is not logged in as "section" in routes.js is null
-}
+//try
+//{
+//  addRoutesPerContext(require.context('@/../zero.Commerce/Plugins/zero.Commerce', true, /routes\.js$/), true); // TODO dynPATH
+//}
+//catch (exc)
+//{
+//  // TODO error will throw when user is not logged in as "section" in routes.js is null
+//}
 //addRoutesPerContext(require.context('@/plugins', true, /routes\.js$/), true); // TODO use zero.pluginPath, but this fails
 
 
@@ -119,7 +120,7 @@ catch (exc)
 
 // add fallback route (this should probably by 404 page)
 
-routes.push({ name: '404', path: '/:pathMatch(.*)*', component: () => import('zero/pages/notfound') });
+routes.push({ name: '404', path: '/:pathMatch(.*)*', component: () => import('@zero/pages/notfound') });
 
 
 
diff --git a/zero.Web.UI/App/zero.config.js b/zero.Web.UI/config/zero.config.js
similarity index 100%
rename from zero.Web.UI/App/zero.config.js
rename to zero.Web.UI/config/zero.config.js
diff --git a/zero.Web.UI/App/zero.plugins.js b/zero.Web.UI/config/zero.plugins.js
similarity index 100%
rename from zero.Web.UI/App/zero.plugins.js
rename to zero.Web.UI/config/zero.plugins.js
diff --git a/zero.Web.UI/App/core/plugin.js b/zero.Web.UI/core/plugin.js
similarity index 100%
rename from zero.Web.UI/App/core/plugin.js
rename to zero.Web.UI/core/plugin.js
diff --git a/zero.Web.UI/App/dashboard/element.vue b/zero.Web.UI/dashboard/element.vue
similarity index 100%
rename from zero.Web.UI/App/dashboard/element.vue
rename to zero.Web.UI/dashboard/element.vue
diff --git a/zero.Web.UI/App/directives/clickoutside.js b/zero.Web.UI/directives/clickoutside.js
similarity index 100%
rename from zero.Web.UI/App/directives/clickoutside.js
rename to zero.Web.UI/directives/clickoutside.js
diff --git a/zero.Web.UI/App/directives/currency.js b/zero.Web.UI/directives/currency.js
similarity index 82%
rename from zero.Web.UI/App/directives/currency.js
rename to zero.Web.UI/directives/currency.js
index 0931f338..fa243b71 100644
--- a/zero.Web.UI/App/directives/currency.js
+++ b/zero.Web.UI/directives/currency.js
@@ -1,4 +1,4 @@
-import Strings from 'zero/services/strings';
+import Strings from '@zero/services/strings.js';
 
 /// <summary>
 /// Outputs a currency
diff --git a/zero.Web.UI/App/directives/date.js b/zero.Web.UI/directives/date.js
similarity index 86%
rename from zero.Web.UI/App/directives/date.js
rename to zero.Web.UI/directives/date.js
index 98b72226..d45284a2 100644
--- a/zero.Web.UI/App/directives/date.js
+++ b/zero.Web.UI/directives/date.js
@@ -1,4 +1,4 @@
-import Strings from 'zero/services/strings';
+import Strings from '@zero/services/strings.js';
 
 /// <summary>
 /// Outputs a formatted date
diff --git a/zero.Web.UI/App/directives/filesize.js b/zero.Web.UI/directives/filesize.js
similarity index 82%
rename from zero.Web.UI/App/directives/filesize.js
rename to zero.Web.UI/directives/filesize.js
index fed27f7c..606bdfd3 100644
--- a/zero.Web.UI/App/directives/filesize.js
+++ b/zero.Web.UI/directives/filesize.js
@@ -1,4 +1,4 @@
-import Strings from 'zero/services/strings';
+import Strings from '@zero/services/strings.js';
 
 /// <summary>
 /// Outputs a filesize
diff --git a/zero.Web.UI/App/directives/localize.js b/zero.Web.UI/directives/localize.js
similarity index 93%
rename from zero.Web.UI/App/directives/localize.js
rename to zero.Web.UI/directives/localize.js
index ff0a4d56..1da9f8d4 100644
--- a/zero.Web.UI/App/directives/localize.js
+++ b/zero.Web.UI/directives/localize.js
@@ -1,4 +1,4 @@
-import Localization from 'zero/services/localization';
+import Localization from '@zero/services/localization.js';
 
 /// <summary>
 /// Localizes the given property and sets the inner-text of the node to its result
diff --git a/zero.Web.UI/App/directives/register.js b/zero.Web.UI/directives/register.js
similarity index 100%
rename from zero.Web.UI/App/directives/register.js
rename to zero.Web.UI/directives/register.js
diff --git a/zero.Web.UI/App/directives/resizable.js b/zero.Web.UI/directives/resizable.js
similarity index 100%
rename from zero.Web.UI/App/directives/resizable.js
rename to zero.Web.UI/directives/resizable.js
diff --git a/zero.Web.UI/App/directives/sortable.js b/zero.Web.UI/directives/sortable.js
similarity index 100%
rename from zero.Web.UI/App/directives/sortable.js
rename to zero.Web.UI/directives/sortable.js
diff --git a/zero.Web.UI/App/editor/editor-component.vue b/zero.Web.UI/editor/editor-component.vue
similarity index 97%
rename from zero.Web.UI/App/editor/editor-component.vue
rename to zero.Web.UI/editor/editor-component.vue
index ae47d1d4..3e2f2ba1 100644
--- a/zero.Web.UI/App/editor/editor-component.vue
+++ b/zero.Web.UI/editor/editor-component.vue
@@ -7,9 +7,9 @@
 
 
 <script>
-  import Strings from 'zero/services/strings';
-  import Objects from 'zero/services/objects';
-  import Localization from 'zero/services/localization';
+  import Strings from '@zero/services/strings.js';
+  import Objects from '@zero/services/objects.js';
+  import Localization from '@zero/services/localization.js';
 
   const staticViews = ['line'];
 
diff --git a/zero.Web.UI/App/editor/editor-overlay.vue b/zero.Web.UI/editor/editor-overlay.vue
similarity index 97%
rename from zero.Web.UI/App/editor/editor-overlay.vue
rename to zero.Web.UI/editor/editor-overlay.vue
index f51f7314..49ca32d0 100644
--- a/zero.Web.UI/App/editor/editor-overlay.vue
+++ b/zero.Web.UI/editor/editor-overlay.vue
@@ -23,7 +23,7 @@
 
 
 <script>
-  import UiEditor from 'zero/editor/editor';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/editor/editor.vue b/zero.Web.UI/editor/editor.vue
similarity index 99%
rename from zero.Web.UI/App/editor/editor.vue
rename to zero.Web.UI/editor/editor.vue
index c5e9042e..2381f5e7 100644
--- a/zero.Web.UI/App/editor/editor.vue
+++ b/zero.Web.UI/editor/editor.vue
@@ -57,7 +57,7 @@
 
 
 <script>
-  import EditorComponent from 'zero/editor/editor-component';
+  import EditorComponent from '@zero/editor/editor-component.vue';
   import { each as _each, map as _map, filter as _filter, isArray as _isArray } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/editor/fields/alias.vue b/zero.Web.UI/editor/fields/alias.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/alias.vue
rename to zero.Web.UI/editor/fields/alias.vue
diff --git a/zero.Web.UI/App/editor/fields/amount.vue b/zero.Web.UI/editor/fields/amount.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/amount.vue
rename to zero.Web.UI/editor/fields/amount.vue
diff --git a/zero.Web.UI/App/editor/fields/checklist.vue b/zero.Web.UI/editor/fields/checklist.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/checklist.vue
rename to zero.Web.UI/editor/fields/checklist.vue
diff --git a/zero.Web.UI/App/editor/fields/colorpicker.vue b/zero.Web.UI/editor/fields/colorpicker.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/colorpicker.vue
rename to zero.Web.UI/editor/fields/colorpicker.vue
diff --git a/zero.Web.UI/App/editor/fields/countrypicker.vue b/zero.Web.UI/editor/fields/countrypicker.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/countrypicker.vue
rename to zero.Web.UI/editor/fields/countrypicker.vue
diff --git a/zero.Web.UI/App/editor/fields/culture.vue b/zero.Web.UI/editor/fields/culture.vue
similarity index 91%
rename from zero.Web.UI/App/editor/fields/culture.vue
rename to zero.Web.UI/editor/fields/culture.vue
index e87106b5..c2e4a3f5 100644
--- a/zero.Web.UI/App/editor/fields/culture.vue
+++ b/zero.Web.UI/editor/fields/culture.vue
@@ -8,7 +8,7 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
+  import LanguagesApi from '@zero/resources/languages.js';
 
   export default {
     emits: ['input'],
diff --git a/zero.Web.UI/App/editor/fields/daterangepicker.vue b/zero.Web.UI/editor/fields/daterangepicker.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/daterangepicker.vue
rename to zero.Web.UI/editor/fields/daterangepicker.vue
diff --git a/zero.Web.UI/App/editor/fields/iconPicker.vue b/zero.Web.UI/editor/fields/iconPicker.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/iconPicker.vue
rename to zero.Web.UI/editor/fields/iconPicker.vue
diff --git a/zero.Web.UI/App/editor/fields/inputlist.vue b/zero.Web.UI/editor/fields/inputlist.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/inputlist.vue
rename to zero.Web.UI/editor/fields/inputlist.vue
diff --git a/zero.Web.UI/App/editor/fields/language.vue b/zero.Web.UI/editor/fields/language.vue
similarity index 93%
rename from zero.Web.UI/App/editor/fields/language.vue
rename to zero.Web.UI/editor/fields/language.vue
index 5adb094b..4bdbac2b 100644
--- a/zero.Web.UI/App/editor/fields/language.vue
+++ b/zero.Web.UI/editor/fields/language.vue
@@ -9,7 +9,7 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
+  import LanguagesApi from '@zero/resources/languages.js';
 
   export default {
     emits: ['input'],
diff --git a/zero.Web.UI/App/editor/fields/media.vue b/zero.Web.UI/editor/fields/media.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/media.vue
rename to zero.Web.UI/editor/fields/media.vue
diff --git a/zero.Web.UI/App/editor/fields/modules.vue b/zero.Web.UI/editor/fields/modules.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/modules.vue
rename to zero.Web.UI/editor/fields/modules.vue
diff --git a/zero.Web.UI/App/editor/fields/nested.vue b/zero.Web.UI/editor/fields/nested.vue
similarity index 94%
rename from zero.Web.UI/App/editor/fields/nested.vue
rename to zero.Web.UI/editor/fields/nested.vue
index fee71986..30730e57 100644
--- a/zero.Web.UI/App/editor/fields/nested.vue
+++ b/zero.Web.UI/editor/fields/nested.vue
@@ -11,9 +11,9 @@
 </template>
 
 <script>
-  import UiEditor from 'zero/editor/editor';
-  import UiEditorOverlay from 'zero/editor/editor-overlay';
-  import Overlay from 'zero/services/overlay';
+  import UiEditor from '@zero/editor/editor.vue';
+  import UiEditorOverlay from '@zero/editor/editor-overlay.vue';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/editor/fields/number.vue b/zero.Web.UI/editor/fields/number.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/number.vue
rename to zero.Web.UI/editor/fields/number.vue
diff --git a/zero.Web.UI/App/editor/fields/output.vue b/zero.Web.UI/editor/fields/output.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/output.vue
rename to zero.Web.UI/editor/fields/output.vue
diff --git a/zero.Web.UI/App/editor/fields/rte.vue b/zero.Web.UI/editor/fields/rte.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/rte.vue
rename to zero.Web.UI/editor/fields/rte.vue
diff --git a/zero.Web.UI/App/editor/fields/select.vue b/zero.Web.UI/editor/fields/select.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/select.vue
rename to zero.Web.UI/editor/fields/select.vue
diff --git a/zero.Web.UI/App/editor/fields/state.vue b/zero.Web.UI/editor/fields/state.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/state.vue
rename to zero.Web.UI/editor/fields/state.vue
diff --git a/zero.Web.UI/App/editor/fields/static/line.vue b/zero.Web.UI/editor/fields/static/line.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/static/line.vue
rename to zero.Web.UI/editor/fields/static/line.vue
diff --git a/zero.Web.UI/App/editor/fields/tags.vue b/zero.Web.UI/editor/fields/tags.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/tags.vue
rename to zero.Web.UI/editor/fields/tags.vue
diff --git a/zero.Web.UI/App/editor/fields/text.vue b/zero.Web.UI/editor/fields/text.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/text.vue
rename to zero.Web.UI/editor/fields/text.vue
diff --git a/zero.Web.UI/App/editor/fields/textarea.vue b/zero.Web.UI/editor/fields/textarea.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/textarea.vue
rename to zero.Web.UI/editor/fields/textarea.vue
diff --git a/zero.Web.UI/App/editor/fields/toggle.vue b/zero.Web.UI/editor/fields/toggle.vue
similarity index 100%
rename from zero.Web.UI/App/editor/fields/toggle.vue
rename to zero.Web.UI/editor/fields/toggle.vue
diff --git a/zero.Web.UI/index.html b/zero.Web.UI/index.html
new file mode 100644
index 00000000..59983a00
--- /dev/null
+++ b/zero.Web.UI/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <!--<link rel="icon" href="/favicon.ico" />-->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Vite App</title>
+</head>
+<body>
+  <div id="app"></div>
+  <script>
+    window.zero = window.zero || {};
+    zero = {
+      apiPath: '/zero/api/',
+      sections: []
+    };
+  </script>
+  <script type="module" src="/app.js"></script>
+</body>
+</html>
diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/navigation.vue
similarity index 95%
rename from zero.Web.UI/App/navigation.vue
rename to zero.Web.UI/navigation.vue
index bf8eddbc..8bfc925e 100644
--- a/zero.Web.UI/App/navigation.vue
+++ b/zero.Web.UI/navigation.vue
@@ -57,10 +57,10 @@
 
 <script>
   import { map as _map, find as _find } from 'underscore';
-  import AuthApi from 'zero/services/auth.js'
-  import MediaApi from 'zero/resources/media.js'
-  import IconPicker from 'zero/components/pickers/iconPicker/iconpicker';
-  import EventHub from 'zero/services/eventhub';
+  import AuthApi from '@zero/services/auth.js'
+  import MediaApi from '@zero/resources/media.js'
+  import IconPicker from '@zero/components/pickers/iconPicker/iconpicker.vue';
+  import EventHub from '@zero/services/eventhub.js';
 
   export default {
     name: 'app-navigation',
diff --git a/zero.Web.UI/package.json b/zero.Web.UI/package.json
index 19faa882..69aa09c2 100644
--- a/zero.Web.UI/package.json
+++ b/zero.Web.UI/package.json
@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "vite-dev": "vite",
+    "vite-build": "vite build",
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "build-dev": "vue-cli-service build --mode development",
@@ -20,6 +22,7 @@
     "vue-router": "4.0.0-beta.13"
   },
   "devDependencies": {
+    "vite": "1.0.0-rc.4",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-router": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
diff --git a/zero.Web.UI/App/pages/dashboard/dashboard.vue b/zero.Web.UI/pages/dashboard/dashboard.vue
similarity index 91%
rename from zero.Web.UI/App/pages/dashboard/dashboard.vue
rename to zero.Web.UI/pages/dashboard/dashboard.vue
index 0c1ba14d..d94234c5 100644
--- a/zero.Web.UI/App/pages/dashboard/dashboard.vue
+++ b/zero.Web.UI/pages/dashboard/dashboard.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-  import DashboardElement from 'zero/dashboard/element';
+  import DashboardElement from '@zero/dashboard/element.vue';
 
   export default {
     components: { DashboardElement },
diff --git a/zero.Web.UI/App/pages/login/login.vue b/zero.Web.UI/pages/login/login.vue
similarity index 98%
rename from zero.Web.UI/App/pages/login/login.vue
rename to zero.Web.UI/pages/login/login.vue
index 4381b2ad..91fc3f17 100644
--- a/zero.Web.UI/App/pages/login/login.vue
+++ b/zero.Web.UI/pages/login/login.vue
@@ -29,7 +29,7 @@
 
 
 <script>
-  import AuthApi from 'zero/services/auth.js'
+  import AuthApi from '@zero/services/auth.js'
 
   export default {
     name: 'app-login',
diff --git a/zero.Web.UI/App/pages/media/detail.vue b/zero.Web.UI/pages/media/detail.vue
similarity index 96%
rename from zero.Web.UI/App/pages/media/detail.vue
rename to zero.Web.UI/pages/media/detail.vue
index c09fdb2a..d55227d7 100644
--- a/zero.Web.UI/App/pages/media/detail.vue
+++ b/zero.Web.UI/pages/media/detail.vue
@@ -32,8 +32,8 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media';
-  import UiEditor from 'zero/editor/editor';
+  import MediaApi from '@zero/resources/media.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/media/media-item.vue b/zero.Web.UI/pages/media/media-item.vue
similarity index 100%
rename from zero.Web.UI/App/pages/media/media-item.vue
rename to zero.Web.UI/pages/media/media-item.vue
diff --git a/zero.Web.UI/App/pages/media/media-overlay-item.vue b/zero.Web.UI/pages/media/media-overlay-item.vue
similarity index 98%
rename from zero.Web.UI/App/pages/media/media-overlay-item.vue
rename to zero.Web.UI/pages/media/media-overlay-item.vue
index beb7149b..7a747c83 100644
--- a/zero.Web.UI/App/pages/media/media-overlay-item.vue
+++ b/zero.Web.UI/pages/media/media-overlay-item.vue
@@ -40,7 +40,7 @@
 
 
 <script>
-  import Overlay from 'zero/services/overlay.js';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/media/media.vue b/zero.Web.UI/pages/media/media.vue
similarity index 94%
rename from zero.Web.UI/App/pages/media/media.vue
rename to zero.Web.UI/pages/media/media.vue
index 66c58b99..fe5c4405 100644
--- a/zero.Web.UI/App/pages/media/media.vue
+++ b/zero.Web.UI/pages/media/media.vue
@@ -55,16 +55,16 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media.js';
-  import MediaFolderApi from 'zero/resources/media-folder.js';
-  import Overlay from 'zero/services/overlay.js';
-  import FolderOverlay from './overlays/folder';
-  import MoveOverlay from './overlays/move';
-  import MediaItemOverlay from './media-overlay-item';
-  import MediaItem from './media-item';
-  import UploadStatusOverlay from './overlays/upload-status';
-  import EventHub from 'zero/services/eventhub';
-  import Notification from 'zero/services/notification.js';
+  import MediaApi from '@zero/resources/media.js';
+  import MediaFolderApi from '@zero/resources/media-folder.js';
+  import Overlay from '@zero/services/overlay.js';
+  import FolderOverlay from './overlays/folder.vue';
+  import MoveOverlay from './overlays/move.vue';
+  import MediaItemOverlay from './media-overlay-item.vue';
+  import MediaItem from './media-item.vue';
+  import UploadStatusOverlay from './overlays/upload-status.vue';
+  import EventHub from '@zero/services/eventhub.js';
+  import Notification from '@zero/services/notification.js';
   import { each as _each, extend as _extend, debounce as _debounce, isArray as _isArray } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/pages/media/overlays/folder.vue b/zero.Web.UI/pages/media/overlays/folder.vue
similarity index 94%
rename from zero.Web.UI/App/pages/media/overlays/folder.vue
rename to zero.Web.UI/pages/media/overlays/folder.vue
index e5f7c9cc..1eb712e1 100644
--- a/zero.Web.UI/App/pages/media/overlays/folder.vue
+++ b/zero.Web.UI/pages/media/overlays/folder.vue
@@ -17,8 +17,8 @@
 
 
 <script>
-  import MediaFolderApi from 'zero/resources/media-folder.js';
-  import Overlay from 'zero/services/overlay.js';
+  import MediaFolderApi from '@zero/resources/media-folder.js';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/media/overlays/move.vue b/zero.Web.UI/pages/media/overlays/move.vue
similarity index 95%
rename from zero.Web.UI/App/pages/media/overlays/move.vue
rename to zero.Web.UI/pages/media/overlays/move.vue
index c7099104..0924af57 100644
--- a/zero.Web.UI/App/pages/media/overlays/move.vue
+++ b/zero.Web.UI/pages/media/overlays/move.vue
@@ -17,9 +17,9 @@
 
 
 <script>
-  import MediaFolderApi from 'zero/resources/media-folder.js';
-  import MediaApi from 'zero/resources/media.js';
-  import Notification from 'zero/services/notification.js'
+  import MediaFolderApi from '@zero/resources/media-folder.js';
+  import MediaApi from '@zero/resources/media.js';
+  import Notification from '@zero/services/notification.js'
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/media/overlays/upload-status.vue b/zero.Web.UI/pages/media/overlays/upload-status.vue
similarity index 97%
rename from zero.Web.UI/App/pages/media/overlays/upload-status.vue
rename to zero.Web.UI/pages/media/overlays/upload-status.vue
index 2e9f172e..aecc1932 100644
--- a/zero.Web.UI/App/pages/media/overlays/upload-status.vue
+++ b/zero.Web.UI/pages/media/overlays/upload-status.vue
@@ -28,8 +28,8 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media.js'
-  import Strings from 'zero/services/strings.js';
+  import MediaApi from '@zero/resources/media.js'
+  import Strings from '@zero/services/strings.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/media/routes.js b/zero.Web.UI/pages/media/routes.js
similarity index 71%
rename from zero.Web.UI/App/pages/media/routes.js
rename to zero.Web.UI/pages/media/routes.js
index 9a54e5ef..908c4f57 100644
--- a/zero.Web.UI/App/pages/media/routes.js
+++ b/zero.Web.UI/pages/media/routes.js
@@ -10,7 +10,7 @@ if (section)
     path: section.url + '/folder/:id',
     props: true,
     name: 'mediafolder',
-    component: () => import('zero/pages/' + alias + '/media')
+    component: () => import('@zero/pages/' + alias + '/media.vue')
   });
 
   routes.push({
@@ -18,14 +18,14 @@ if (section)
     path: 'edit/:id',
     props: true,
     name: 'mediaitem',
-    component: () => import('zero/pages/' + alias + '/detail')
+    component: () => import('@zero/pages/' + alias + '/detail.vue')
   });
 
   routes.push({
     section: alias,
     path: 'recyclebin',
     name: 'mediarecyclebin',
-    component: () => import('zero/pages/' + alias + '/recyclebin'),
+    component: () => import('@zero/pages/' + alias + '/recyclebin.vue'),
     meta: {
       name: '@recyclebin.name'
     }
@@ -34,7 +34,7 @@ if (section)
   //routes.push({
   //  path: 'history',
   //  name: 'history',
-  //  component: () => import('zero/pages/' + alias + '/history'),
+  //  component: () => import('@zero/pages/' + alias + '/history.vue'),
   //  meta: {
   //    name: '@page.history.name'
   //  }
diff --git a/zero.Web.UI/App/pages/media/upload.vue b/zero.Web.UI/pages/media/upload.vue
similarity index 99%
rename from zero.Web.UI/App/pages/media/upload.vue
rename to zero.Web.UI/pages/media/upload.vue
index ca293f91..0fcbc8ab 100644
--- a/zero.Web.UI/App/pages/media/upload.vue
+++ b/zero.Web.UI/pages/media/upload.vue
@@ -33,7 +33,7 @@
 
 
 <script>
-  import MediaApi from 'zero/resources/media.js';
+  import MediaApi from '@zero/resources/media.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/notfound.vue b/zero.Web.UI/pages/notfound.vue
similarity index 100%
rename from zero.Web.UI/App/pages/notfound.vue
rename to zero.Web.UI/pages/notfound.vue
diff --git a/zero.Web.UI/App/pages/pages/overlays/copy.vue b/zero.Web.UI/pages/pages/overlays/copy.vue
similarity index 96%
rename from zero.Web.UI/App/pages/pages/overlays/copy.vue
rename to zero.Web.UI/pages/pages/overlays/copy.vue
index 4f4f1565..3584a5c4 100644
--- a/zero.Web.UI/App/pages/pages/overlays/copy.vue
+++ b/zero.Web.UI/pages/pages/overlays/copy.vue
@@ -22,9 +22,9 @@
 
 
 <script>
-  import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
-  import Notification from 'zero/services/notification.js'
+  import PageTreeApi from '@zero/resources/page-tree.js'
+  import PagesApi from '@zero/resources/pages.js';
+  import Notification from '@zero/services/notification.js'
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/overlays/create.vue b/zero.Web.UI/pages/pages/overlays/create.vue
similarity index 96%
rename from zero.Web.UI/App/pages/pages/overlays/create.vue
rename to zero.Web.UI/pages/pages/overlays/create.vue
index ad9b8782..bb9d8d5e 100644
--- a/zero.Web.UI/App/pages/pages/overlays/create.vue
+++ b/zero.Web.UI/pages/pages/overlays/create.vue
@@ -22,8 +22,8 @@
 
 
 <script>
-  import PagesApi from 'zero/resources/pages.js';
-  import Overlay from 'zero/services/overlay.js';
+  import PagesApi from '@zero/resources/pages.js';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/overlays/move.vue b/zero.Web.UI/pages/pages/overlays/move.vue
similarity index 95%
rename from zero.Web.UI/App/pages/pages/overlays/move.vue
rename to zero.Web.UI/pages/pages/overlays/move.vue
index 1a81b728..08b34d54 100644
--- a/zero.Web.UI/App/pages/pages/overlays/move.vue
+++ b/zero.Web.UI/pages/pages/overlays/move.vue
@@ -17,9 +17,9 @@
 
 
 <script>
-  import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
-  import Notification from 'zero/services/notification.js'
+  import PageTreeApi from '@zero/resources/page-tree.js'
+  import PagesApi from '@zero/resources/pages.js';
+  import Notification from '@zero/services/notification.js'
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/overlays/sort.vue b/zero.Web.UI/pages/pages/overlays/sort.vue
similarity index 93%
rename from zero.Web.UI/App/pages/pages/overlays/sort.vue
rename to zero.Web.UI/pages/pages/overlays/sort.vue
index 8f84eddd..601b4dba 100644
--- a/zero.Web.UI/App/pages/pages/overlays/sort.vue
+++ b/zero.Web.UI/pages/pages/overlays/sort.vue
@@ -22,10 +22,10 @@
 
 
 <script>
-  import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages';
-  import Arrays from 'zero/services/arrays.js'
-  import Notification from 'zero/services/notification.js'
+  import PageTreeApi from '@zero/resources/page-tree.js'
+  import PagesApi from '@zero/resources/pages.js';
+  import Arrays from '@zero/services/arrays.js'
+  import Notification from '@zero/services/notification.js'
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/page-info.vue b/zero.Web.UI/pages/pages/page-info.vue
similarity index 97%
rename from zero.Web.UI/App/pages/pages/page-info.vue
rename to zero.Web.UI/pages/pages/page-info.vue
index e9e41eda..b4e45370 100644
--- a/zero.Web.UI/App/pages/pages/page-info.vue
+++ b/zero.Web.UI/pages/pages/page-info.vue
@@ -34,7 +34,7 @@
 
 
 <script>
-  import PagesApi from 'zero/resources/pages';
+  import PagesApi from '@zero/resources/pages.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/pages/pages/page.vue b/zero.Web.UI/pages/pages/page.vue
similarity index 94%
rename from zero.Web.UI/App/pages/pages/page.vue
rename to zero.Web.UI/pages/pages/page.vue
index 2f60b022..6b392ecd 100644
--- a/zero.Web.UI/App/pages/pages/page.vue
+++ b/zero.Web.UI/pages/pages/page.vue
@@ -27,14 +27,14 @@
 
 
 <script>
-  import UiEditor from 'zero/editor/editor';
-  import PagesApi from 'zero/resources/pages';
-  import EventHub from 'zero/services/eventhub';
-  import InfoTab from './page-info';
-  import Overlay from 'zero/services/overlay.js'
-  import MoveOverlay from './overlays/move'
-  import CopyOverlay from './overlays/copy'
-  import Strings from 'zero/services/strings';
+  import UiEditor from '@zero/editor/editor.vue';
+  import PagesApi from '@zero/resources/pages.js';
+  import EventHub from '@zero/services/eventhub.js';
+  import InfoTab from './page-info.vue';
+  import Overlay from '@zero/services/overlay.js'
+  import MoveOverlay from './overlays/move.vue'
+  import CopyOverlay from './overlays/copy.vue'
+  import Strings from '@zero/services/strings.js';
   import { find as _find, debounce as _debounce } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/pages/pages/pages.vue b/zero.Web.UI/pages/pages/pages.vue
similarity index 93%
rename from zero.Web.UI/App/pages/pages/pages.vue
rename to zero.Web.UI/pages/pages/pages.vue
index b2936cc3..84763aaa 100644
--- a/zero.Web.UI/App/pages/pages/pages.vue
+++ b/zero.Web.UI/pages/pages/pages.vue
@@ -33,16 +33,16 @@
 
 
 <script>
-  import PageTreeApi from 'zero/resources/page-tree.js'
-  import PagesApi from 'zero/resources/pages.js'
-  import Overlay from 'zero/services/overlay.js'
-  import CreateOverlay from './overlays/create'
-  import SortOverlay from './overlays/sort'
-  import MoveOverlay from './overlays/move'
-  import CopyOverlay from './overlays/copy'
-  import EventHub from 'zero/services/eventhub'
-  import Notification from 'zero/services/notification.js'
-  import Strings from 'zero/services/strings';
+  import PageTreeApi from '@zero/resources/page-tree.js'
+  import PagesApi from '@zero/resources/pages.js'
+  import Overlay from '@zero/services/overlay.js'
+  import CreateOverlay from './overlays/create.vue'
+  import SortOverlay from './overlays/sort.vue'
+  import MoveOverlay from './overlays/move.vue'
+  import CopyOverlay from './overlays/copy.vue'
+  import EventHub from '@zero/services/eventhub.js'
+  import Notification from '@zero/services/notification.js'
+  import Strings from '@zero/services/strings.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue b/zero.Web.UI/pages/pages/recyclebin/recyclebin-actions.vue
similarity index 96%
rename from zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue
rename to zero.Web.UI/pages/pages/recyclebin/recyclebin-actions.vue
index 956f88cf..997dbd8c 100644
--- a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin-actions.vue
+++ b/zero.Web.UI/pages/pages/recyclebin/recyclebin-actions.vue
@@ -35,8 +35,8 @@
 
 
 <script>
-  import RecycleBinApi from 'zero/resources/recycle-bin.js'
-  import PagesApi from 'zero/resources/pages';
+  import RecycleBinApi from '@zero/resources/recycle-bin.js'
+  import PagesApi from '@zero/resources/pages.js';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue b/zero.Web.UI/pages/pages/recyclebin/recyclebin.vue
similarity index 90%
rename from zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue
rename to zero.Web.UI/pages/pages/recyclebin/recyclebin.vue
index df3ca09b..04c4bf0e 100644
--- a/zero.Web.UI/App/pages/pages/recyclebin/recyclebin.vue
+++ b/zero.Web.UI/pages/pages/recyclebin/recyclebin.vue
@@ -14,10 +14,10 @@
 <script>
   const GROUP = "pages";
 
-  import RecycleBinApi from 'zero/resources/recycle-bin.js'
-  import Overlay from 'zero/services/overlay.js'
-  import RecycleBinActionsOverlay from './recyclebin-actions'
-  import EventHub from 'zero/services/eventhub'
+  import RecycleBinApi from '@zero/resources/recycle-bin.js'
+  import Overlay from '@zero/services/overlay.js'
+  import RecycleBinActionsOverlay from './recyclebin-actions.vue'
+  import EventHub from '@zero/services/eventhub.js'
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/pages/routes.js b/zero.Web.UI/pages/pages/routes.js
similarity index 70%
rename from zero.Web.UI/App/pages/pages/routes.js
rename to zero.Web.UI/pages/pages/routes.js
index af85b7e4..a39cd621 100644
--- a/zero.Web.UI/App/pages/pages/routes.js
+++ b/zero.Web.UI/pages/pages/routes.js
@@ -10,20 +10,20 @@ if (section)
     path: 'edit/:id',
     props: true,
     name: 'page',
-    component: () => import('zero/pages/' + alias + '/page')
+    component: () => import('@zero/pages/' + alias + '/page.vue')
   });
 
   routes.push({
     path: 'create/:type/:parent?',
     props: true,
     name: 'page-create',
-    component: () => import('zero/pages/' + alias + '/page')
+    component: () => import('@zero/pages/' + alias + '/page.vue')
   });
 
   routes.push({
     path: 'recyclebin',
     name: 'recyclebin',
-    component: () => import('zero/pages/' + alias + '/recyclebin/recyclebin'),
+    component: () => import('@zero/pages/' + alias + '/recyclebin/recyclebin.vue'),
     meta: {
       name: '@recyclebin.name'
     }
@@ -32,7 +32,7 @@ if (section)
   routes.push({
     path: 'history',
     name: 'history',
-    component: () => import('zero/pages/' + alias + '/history'),
+    component: () => import('@zero/pages/' + alias + '/history.vue'),
     meta: {
       name: '@page.history.name'
     }
diff --git a/zero.Web.UI/App/pages/password-change.vue b/zero.Web.UI/pages/password-change.vue
similarity index 95%
rename from zero.Web.UI/App/pages/password-change.vue
rename to zero.Web.UI/pages/password-change.vue
index 139fd64d..af5894ec 100644
--- a/zero.Web.UI/App/pages/password-change.vue
+++ b/zero.Web.UI/pages/password-change.vue
@@ -24,8 +24,8 @@
 
 
 <script>
-  import AuthApi from 'zero/services/auth.js'
-  import UsersApi from 'zero/resources/users.js'
+  import AuthApi from '@zero/services/auth.js'
+  import UsersApi from '@zero/resources/users.js'
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/preview.vue b/zero.Web.UI/pages/preview.vue
similarity index 100%
rename from zero.Web.UI/App/pages/preview.vue
rename to zero.Web.UI/pages/preview.vue
diff --git a/zero.Web.UI/App/pages/settings/application-features.vue b/zero.Web.UI/pages/settings/application-features.vue
similarity index 94%
rename from zero.Web.UI/App/pages/settings/application-features.vue
rename to zero.Web.UI/pages/settings/application-features.vue
index 4c011684..75a13a78 100644
--- a/zero.Web.UI/App/pages/settings/application-features.vue
+++ b/zero.Web.UI/pages/settings/application-features.vue
@@ -8,7 +8,7 @@
 
 
 <script>
-  import ApplicationsApi from 'zero/resources/applications';
+  import ApplicationsApi from '@zero/resources/applications.js';
 
   export default {
     props: {
diff --git a/zero.Web.UI/App/pages/settings/application.vue b/zero.Web.UI/pages/settings/application.vue
similarity index 91%
rename from zero.Web.UI/App/pages/settings/application.vue
rename to zero.Web.UI/pages/settings/application.vue
index 8ec48068..f6e2b849 100644
--- a/zero.Web.UI/App/pages/settings/application.vue
+++ b/zero.Web.UI/pages/settings/application.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import ApplicationsApi from 'zero/resources/applications';
-  import UiEditor from 'zero/editor/editor';
+  import ApplicationsApi from '@zero/resources/applications.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/applications-items.vue b/zero.Web.UI/pages/settings/applications-items.vue
similarity index 100%
rename from zero.Web.UI/App/pages/settings/applications-items.vue
rename to zero.Web.UI/pages/settings/applications-items.vue
diff --git a/zero.Web.UI/App/pages/settings/applications.vue b/zero.Web.UI/pages/settings/applications.vue
similarity index 81%
rename from zero.Web.UI/App/pages/settings/applications.vue
rename to zero.Web.UI/pages/settings/applications.vue
index df389ee1..bb58d0ea 100644
--- a/zero.Web.UI/App/pages/settings/applications.vue
+++ b/zero.Web.UI/pages/settings/applications.vue
@@ -9,8 +9,8 @@
 
 
 <script>
-  import ApplicationsItems from 'zero/pages/settings/applications-items'
-  import ApplicationsApi from 'zero/resources/applications.js'
+  import ApplicationsItems from '@zero/pages/settings/applications-items.vue'
+  import ApplicationsApi from '@zero/resources/applications.js'
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/countries.vue b/zero.Web.UI/pages/settings/countries.vue
similarity index 92%
rename from zero.Web.UI/App/pages/settings/countries.vue
rename to zero.Web.UI/pages/settings/countries.vue
index ce0be72c..a82a5d67 100644
--- a/zero.Web.UI/App/pages/settings/countries.vue
+++ b/zero.Web.UI/pages/settings/countries.vue
@@ -12,7 +12,7 @@
 
 
 <script>
-  import CountriesApi from 'zero/resources/countries.js';
+  import CountriesApi from '@zero/resources/countries.js';
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/country.vue b/zero.Web.UI/pages/settings/country.vue
similarity index 92%
rename from zero.Web.UI/App/pages/settings/country.vue
rename to zero.Web.UI/pages/settings/country.vue
index 47816f42..71b0f2af 100644
--- a/zero.Web.UI/App/pages/settings/country.vue
+++ b/zero.Web.UI/pages/settings/country.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import CountriesApi from 'zero/resources/countries';
-  import UiEditor from 'zero/editor/editor';
+  import CountriesApi from '@zero/resources/countries.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/language.vue b/zero.Web.UI/pages/settings/language.vue
similarity index 91%
rename from zero.Web.UI/App/pages/settings/language.vue
rename to zero.Web.UI/pages/settings/language.vue
index 21f87b9b..f5ca55f7 100644
--- a/zero.Web.UI/App/pages/settings/language.vue
+++ b/zero.Web.UI/pages/settings/language.vue
@@ -7,8 +7,8 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages';
-  import UiEditor from 'zero/editor/editor';
+  import LanguagesApi from '@zero/resources/languages.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/languages.vue b/zero.Web.UI/pages/settings/languages.vue
similarity index 92%
rename from zero.Web.UI/App/pages/settings/languages.vue
rename to zero.Web.UI/pages/settings/languages.vue
index 94939cbd..05f5839c 100644
--- a/zero.Web.UI/App/pages/settings/languages.vue
+++ b/zero.Web.UI/pages/settings/languages.vue
@@ -12,7 +12,7 @@
 
 
 <script>
-  import LanguagesApi from 'zero/resources/languages.js';
+  import LanguagesApi from '@zero/resources/languages.js';
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/role.vue b/zero.Web.UI/pages/settings/role.vue
similarity index 93%
rename from zero.Web.UI/App/pages/settings/role.vue
rename to zero.Web.UI/pages/settings/role.vue
index 2e148849..b2245619 100644
--- a/zero.Web.UI/App/pages/settings/role.vue
+++ b/zero.Web.UI/pages/settings/role.vue
@@ -8,8 +8,8 @@
 
 <script>
   import { filter as _filter } from 'underscore';
-  import UserRolesApi from 'zero/resources/userRoles';
-  import UiEditor from 'zero/editor/editor';
+  import UserRolesApi from '@zero/resources/userRoles.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/routes.js b/zero.Web.UI/pages/settings/routes.js
similarity index 99%
rename from zero.Web.UI/App/pages/settings/routes.js
rename to zero.Web.UI/pages/settings/routes.js
index be46b9f2..5a3fd4e5 100644
--- a/zero.Web.UI/App/pages/settings/routes.js
+++ b/zero.Web.UI/pages/settings/routes.js
@@ -37,7 +37,7 @@ if (section)
       routes.push({
         path: area.url,
         name: alias + '-' + area.alias,
-        component: () => import(`zero/pages/${alias}/${area.alias}`),
+        component: () => import(`zero/pages/${alias}/${area.alias}.vue`),
         meta: {
           name: [area.name, section.name]
         }
@@ -74,7 +74,7 @@ if (section)
         routes.push({
           path: area.url + '/' + path + (!isCreate ? '/:id' : '/:scope?'),
           name: alias + '-' + area.alias + '-' + path.replace('/', '-'),
-          component: () => import(`zero/pages/${alias}/${detail.view}`),
+          component: () => import(`zero/pages/${alias}/${detail.view}.vue`),
           props: true,
           meta: {
             create: isCreate,
diff --git a/zero.Web.UI/App/pages/settings/settings.vue b/zero.Web.UI/pages/settings/settings.vue
similarity index 95%
rename from zero.Web.UI/App/pages/settings/settings.vue
rename to zero.Web.UI/pages/settings/settings.vue
index 42863f25..c25b5f4f 100644
--- a/zero.Web.UI/App/pages/settings/settings.vue
+++ b/zero.Web.UI/pages/settings/settings.vue
@@ -25,8 +25,8 @@
 
 
 <script>
-  import ApplicationsItems from 'zero/pages/settings/applications-items'
-  import SettingsApi from 'zero/resources/settings.js';
+  import ApplicationsItems from '@zero/pages/settings/applications-items.vue'
+  import SettingsApi from '@zero/resources/settings.js';
 
   export default {
     name: 'app-settings',
diff --git a/zero.Web.UI/App/pages/settings/translation.vue b/zero.Web.UI/pages/settings/translation.vue
similarity index 94%
rename from zero.Web.UI/App/pages/settings/translation.vue
rename to zero.Web.UI/pages/settings/translation.vue
index 2b155118..eefdcb4f 100644
--- a/zero.Web.UI/App/pages/settings/translation.vue
+++ b/zero.Web.UI/pages/settings/translation.vue
@@ -31,9 +31,9 @@
 
 
 <script>
-  import TranslationsApi from 'zero/resources/translations.js';
-  import Overlay from 'zero/services/overlay.js';
-  import Editor from 'zero/editor/editor';
+  import TranslationsApi from '@zero/resources/translations.js';
+  import Overlay from '@zero/services/overlay.js';
+  import Editor from '@zero/editor/editor.vue';
 
   export default {
 
diff --git a/zero.Web.UI/App/pages/settings/translations.vue b/zero.Web.UI/pages/settings/translations.vue
similarity index 90%
rename from zero.Web.UI/App/pages/settings/translations.vue
rename to zero.Web.UI/pages/settings/translations.vue
index 8a529152..6a3c7cf7 100644
--- a/zero.Web.UI/App/pages/settings/translations.vue
+++ b/zero.Web.UI/pages/settings/translations.vue
@@ -12,9 +12,9 @@
 
 
 <script>
-  import TranslationsApi from 'zero/resources/translations.js';
-  import Overlay from 'zero/services/overlay.js';
-  import AddOverlay from './translation';
+  import TranslationsApi from '@zero/resources/translations.js';
+  import Overlay from '@zero/services/overlay.js';
+  import AddOverlay from './translation.vue';
 
   export default {
     data: () => ({
diff --git a/zero.Web.UI/App/pages/settings/user.vue b/zero.Web.UI/pages/settings/user.vue
similarity index 97%
rename from zero.Web.UI/App/pages/settings/user.vue
rename to zero.Web.UI/pages/settings/user.vue
index c92004e6..a72c95cf 100644
--- a/zero.Web.UI/App/pages/settings/user.vue
+++ b/zero.Web.UI/pages/settings/user.vue
@@ -27,8 +27,8 @@
 
 <script>
   import { filter as _filter } from 'underscore';
-  import UsersApi from 'zero/resources/users';
-  import UiEditor from 'zero/editor/editor';
+  import UsersApi from '@zero/resources/users.js';
+  import UiEditor from '@zero/editor/editor.vue';
 
   export default {
     props: ['id'],
diff --git a/zero.Web.UI/App/pages/settings/users.vue b/zero.Web.UI/pages/settings/users.vue
similarity index 96%
rename from zero.Web.UI/App/pages/settings/users.vue
rename to zero.Web.UI/pages/settings/users.vue
index 6b552fbb..07775f5d 100644
--- a/zero.Web.UI/App/pages/settings/users.vue
+++ b/zero.Web.UI/pages/settings/users.vue
@@ -26,8 +26,8 @@
 
 
 <script>
-  import UserRolesApi from 'zero/resources/userRoles.js';
-  import UsersApi from 'zero/resources/users.js';
+  import UserRolesApi from '@zero/resources/userRoles.js';
+  import UsersApi from '@zero/resources/users.js';
   import { filter as _filter, map as _map } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/pages/spaces/routes.js b/zero.Web.UI/pages/spaces/routes.js
similarity index 67%
rename from zero.Web.UI/App/pages/spaces/routes.js
rename to zero.Web.UI/pages/spaces/routes.js
index 9847a9d6..102f3e5a 100644
--- a/zero.Web.UI/App/pages/spaces/routes.js
+++ b/zero.Web.UI/pages/spaces/routes.js
@@ -10,21 +10,21 @@ if (section)
     path: ':alias/edit/:id',
     props: true,
     name: 'space-item',
-    component: () => import('zero/pages/' + alias + '/spaces')
+    component: () => import('@zero/pages/' + alias + '/spaces.vue')
   });
 
   routes.push({
     path: ':alias',
     props: true,
     name: 'space',
-    component: () => import('zero/pages/' + alias + '/spaces')
+    component: () => import('@zero/pages/' + alias + '/spaces.vue')
   });
 
   routes.push({
     path: ':alias/create/:scope?',
     props: true,
     name: 'space-create',
-    component: () => import('zero/pages/' + alias + '/spaces'),
+    component: () => import('@zero/pages/' + alias + '/spaces.vue'),
     meta: {
       create: true
     }
@@ -34,20 +34,20 @@ if (section)
   //  path: 'list/:id',
   //  props: true,
   //  name: 'space_list',
-  //  component: () => import('zero/pages/' + alias + '/views/list')
+  //  component: () => import('@zero/pages/' + alias + '/views/list.vue')
   //});
 
   //routes.push({
   //  path: ':alias',
   //  props: true,
   //  name: 'space',
-  //  component: () => import('zero/pages/' + alias + '/views/editor')
+  //  component: () => import('@zero/pages/' + alias + '/views/editor.vue')
   //});
 
   //routes.push({
   //  path: 'history',
   //  name: 'history',
-  //  component: () => import('zero/pages/' + alias + '/history'),
+  //  component: () => import('@zero/pages/' + alias + '/history.vue'),
   //  meta: {
   //    name: '@page.history.name'
   //  }
diff --git a/zero.Web.UI/App/pages/spaces/spaces.vue b/zero.Web.UI/pages/spaces/spaces.vue
similarity index 94%
rename from zero.Web.UI/App/pages/spaces/spaces.vue
rename to zero.Web.UI/pages/spaces/spaces.vue
index 0bbc0770..5d191338 100644
--- a/zero.Web.UI/App/pages/spaces/spaces.vue
+++ b/zero.Web.UI/pages/spaces/spaces.vue
@@ -20,10 +20,10 @@
 </template>
 
 <script>
-  import SpaceEditor from 'zero/pages/spaces/views/editor';
-  import SpaceList from 'zero/pages/spaces/views/list';
-  import SpaceCustom from 'zero/pages/spaces/views/custom';
-  import SpacesApi from 'zero/resources/spaces.js';
+  import SpaceEditor from '@zero/pages/spaces/views/editor.vue';
+  import SpaceList from '@zero/pages/spaces/views/list.vue';
+  import SpaceCustom from '@zero/pages/spaces/views/custom.vue';
+  import SpacesApi from '@zero/resources/spaces.js';
   import { find as _find } from 'underscore';
 
   export default {
diff --git a/zero.Web.UI/App/pages/spaces/views/custom.vue b/zero.Web.UI/pages/spaces/views/custom.vue
similarity index 91%
rename from zero.Web.UI/App/pages/spaces/views/custom.vue
rename to zero.Web.UI/pages/spaces/views/custom.vue
index 4cc253d4..15819314 100644
--- a/zero.Web.UI/App/pages/spaces/views/custom.vue
+++ b/zero.Web.UI/pages/spaces/views/custom.vue
@@ -11,7 +11,7 @@
 
 
 <script>
-  import SpacesApi from 'zero/resources/spaces.js';
+  import SpacesApi from '@zero/resources/spaces.js';
 
   export default {
     props: [ 'alias' ],
diff --git a/zero.Web.UI/App/pages/spaces/views/editor.vue b/zero.Web.UI/pages/spaces/views/editor.vue
similarity index 91%
rename from zero.Web.UI/App/pages/spaces/views/editor.vue
rename to zero.Web.UI/pages/spaces/views/editor.vue
index d8dd1bb3..520597cf 100644
--- a/zero.Web.UI/App/pages/spaces/views/editor.vue
+++ b/zero.Web.UI/pages/spaces/views/editor.vue
@@ -7,9 +7,9 @@
 
 
 <script>
-  import SpacesApi from 'zero/resources/spaces.js';
-  import UiEditor from 'zero/editor/editor';
-  import Overlay from 'zero/services/overlay.js';
+  import SpacesApi from '@zero/resources/spaces.js';
+  import UiEditor from '@zero/editor/editor.vue';
+  import Overlay from '@zero/services/overlay.js';
 
   export default {
     props: ['config', 'space'],
diff --git a/zero.Web.UI/App/pages/spaces/views/list.vue b/zero.Web.UI/pages/spaces/views/list.vue
similarity index 97%
rename from zero.Web.UI/App/pages/spaces/views/list.vue
rename to zero.Web.UI/pages/spaces/views/list.vue
index 5057255b..1755255d 100644
--- a/zero.Web.UI/App/pages/spaces/views/list.vue
+++ b/zero.Web.UI/pages/spaces/views/list.vue
@@ -12,7 +12,7 @@
 
 
 <script>
-  import SpacesApi from 'zero/resources/spaces.js';
+  import SpacesApi from '@zero/resources/spaces.js';
 
   export default {
     props: [ 'space', 'config' ],
diff --git a/zero.Web.UI/App/renderer/createListField.js b/zero.Web.UI/renderer/createListField.js
similarity index 90%
rename from zero.Web.UI/App/renderer/createListField.js
rename to zero.Web.UI/renderer/createListField.js
index 504fff73..e8d3debd 100644
--- a/zero.Web.UI/App/renderer/createListField.js
+++ b/zero.Web.UI/renderer/createListField.js
@@ -1,4 +1,4 @@
-import { warn } from 'zero/services/debug';
+import { warn } from '@zero/services/debug.js';
 
 
 /**
diff --git a/zero.Web.UI/App/renderer/createListRenderer.js b/zero.Web.UI/renderer/createListRenderer.js
similarity index 96%
rename from zero.Web.UI/App/renderer/createListRenderer.js
rename to zero.Web.UI/renderer/createListRenderer.js
index 42c2f791..3f38dddb 100644
--- a/zero.Web.UI/App/renderer/createListRenderer.js
+++ b/zero.Web.UI/renderer/createListRenderer.js
@@ -1,4 +1,4 @@
-import { warn } from 'zero/services/debug';
+import { warn } from '@zero/services/debug.js';
 
 
 let createListRenderer = function (name, opts)
diff --git a/zero.Web.UI/App/renderer/list-fields/text.js b/zero.Web.UI/renderer/list-fields/text.js
similarity index 85%
rename from zero.Web.UI/App/renderer/list-fields/text.js
rename to zero.Web.UI/renderer/list-fields/text.js
index de8340ab..4597729e 100644
--- a/zero.Web.UI/App/renderer/list-fields/text.js
+++ b/zero.Web.UI/renderer/list-fields/text.js
@@ -1,5 +1,5 @@
-import Localization from 'zero/services/localization';
-import createListField from 'zero/renderer/createListField';
+import Localization from '@zero/services/localization.js';
+import createListField from '@zero/renderer/createListField.js';
 
 let field = createListField('text');
 
diff --git a/zero.Web.UI/App/renderers/application.js b/zero.Web.UI/renderers/application.js
similarity index 100%
rename from zero.Web.UI/App/renderers/application.js
rename to zero.Web.UI/renderers/application.js
diff --git a/zero.Web.UI/App/renderers/country.js b/zero.Web.UI/renderers/country.js
similarity index 100%
rename from zero.Web.UI/App/renderers/country.js
rename to zero.Web.UI/renderers/country.js
diff --git a/zero.Web.UI/App/renderers/language.js b/zero.Web.UI/renderers/language.js
similarity index 100%
rename from zero.Web.UI/App/renderers/language.js
rename to zero.Web.UI/renderers/language.js
diff --git a/zero.Web.UI/App/renderers/media.js b/zero.Web.UI/renderers/media.js
similarity index 100%
rename from zero.Web.UI/App/renderers/media.js
rename to zero.Web.UI/renderers/media.js
diff --git a/zero.Web.UI/App/renderers/register.js b/zero.Web.UI/renderers/register.js
similarity index 100%
rename from zero.Web.UI/App/renderers/register.js
rename to zero.Web.UI/renderers/register.js
diff --git a/zero.Web.UI/App/renderers/translation.js b/zero.Web.UI/renderers/translation.js
similarity index 100%
rename from zero.Web.UI/App/renderers/translation.js
rename to zero.Web.UI/renderers/translation.js
diff --git a/zero.Web.UI/App/renderers/user.js b/zero.Web.UI/renderers/user.js
similarity index 100%
rename from zero.Web.UI/App/renderers/user.js
rename to zero.Web.UI/renderers/user.js
diff --git a/zero.Web.UI/App/renderers/userRole.js b/zero.Web.UI/renderers/userRole.js
similarity index 100%
rename from zero.Web.UI/App/renderers/userRole.js
rename to zero.Web.UI/renderers/userRole.js
diff --git a/zero.Web.UI/App/resources/applications.js b/zero.Web.UI/resources/applications.js
similarity index 100%
rename from zero.Web.UI/App/resources/applications.js
rename to zero.Web.UI/resources/applications.js
diff --git a/zero.Web.UI/App/resources/countries.js b/zero.Web.UI/resources/countries.js
similarity index 100%
rename from zero.Web.UI/App/resources/countries.js
rename to zero.Web.UI/resources/countries.js
diff --git a/zero.Web.UI/App/resources/languages.js b/zero.Web.UI/resources/languages.js
similarity index 100%
rename from zero.Web.UI/App/resources/languages.js
rename to zero.Web.UI/resources/languages.js
diff --git a/zero.Web.UI/App/resources/media-folder.js b/zero.Web.UI/resources/media-folder.js
similarity index 100%
rename from zero.Web.UI/App/resources/media-folder.js
rename to zero.Web.UI/resources/media-folder.js
diff --git a/zero.Web.UI/App/resources/media.js b/zero.Web.UI/resources/media.js
similarity index 97%
rename from zero.Web.UI/App/resources/media.js
rename to zero.Web.UI/resources/media.js
index 96fdf795..1a043c82 100644
--- a/zero.Web.UI/App/resources/media.js
+++ b/zero.Web.UI/resources/media.js
@@ -1,5 +1,5 @@
 import Axios from 'axios';
-import Strings from 'zero/services/strings';
+import Strings from '@zero/services/strings.js';
 
 const base = 'media/';
 
diff --git a/zero.Web.UI/App/resources/modules.js b/zero.Web.UI/resources/modules.js
similarity index 100%
rename from zero.Web.UI/App/resources/modules.js
rename to zero.Web.UI/resources/modules.js
diff --git a/zero.Web.UI/App/resources/page-tree.js b/zero.Web.UI/resources/page-tree.js
similarity index 100%
rename from zero.Web.UI/App/resources/page-tree.js
rename to zero.Web.UI/resources/page-tree.js
diff --git a/zero.Web.UI/App/resources/pages.js b/zero.Web.UI/resources/pages.js
similarity index 100%
rename from zero.Web.UI/App/resources/pages.js
rename to zero.Web.UI/resources/pages.js
diff --git a/zero.Web.UI/App/resources/recycle-bin.js b/zero.Web.UI/resources/recycle-bin.js
similarity index 100%
rename from zero.Web.UI/App/resources/recycle-bin.js
rename to zero.Web.UI/resources/recycle-bin.js
diff --git a/zero.Web.UI/App/resources/sections.js b/zero.Web.UI/resources/sections.js
similarity index 100%
rename from zero.Web.UI/App/resources/sections.js
rename to zero.Web.UI/resources/sections.js
diff --git a/zero.Web.UI/App/resources/settings.js b/zero.Web.UI/resources/settings.js
similarity index 100%
rename from zero.Web.UI/App/resources/settings.js
rename to zero.Web.UI/resources/settings.js
diff --git a/zero.Web.UI/App/resources/spaces.js b/zero.Web.UI/resources/spaces.js
similarity index 100%
rename from zero.Web.UI/App/resources/spaces.js
rename to zero.Web.UI/resources/spaces.js
diff --git a/zero.Web.UI/App/resources/translations.js b/zero.Web.UI/resources/translations.js
similarity index 100%
rename from zero.Web.UI/App/resources/translations.js
rename to zero.Web.UI/resources/translations.js
diff --git a/zero.Web.UI/App/resources/userRoles.js b/zero.Web.UI/resources/userRoles.js
similarity index 100%
rename from zero.Web.UI/App/resources/userRoles.js
rename to zero.Web.UI/resources/userRoles.js
diff --git a/zero.Web.UI/App/resources/users.js b/zero.Web.UI/resources/users.js
similarity index 100%
rename from zero.Web.UI/App/resources/users.js
rename to zero.Web.UI/resources/users.js
diff --git a/zero.Web.UI/App/resources/utils.js b/zero.Web.UI/resources/utils.js
similarity index 100%
rename from zero.Web.UI/App/resources/utils.js
rename to zero.Web.UI/resources/utils.js
diff --git a/zero.Web.UI/App/services/arrays.js b/zero.Web.UI/services/arrays.js
similarity index 100%
rename from zero.Web.UI/App/services/arrays.js
rename to zero.Web.UI/services/arrays.js
diff --git a/zero.Web.UI/App/services/auth.js b/zero.Web.UI/services/auth.js
similarity index 93%
rename from zero.Web.UI/App/services/auth.js
rename to zero.Web.UI/services/auth.js
index c6718a4f..e7b72405 100644
--- a/zero.Web.UI/App/services/auth.js
+++ b/zero.Web.UI/services/auth.js
@@ -1,7 +1,7 @@
-import Overlay from 'zero/services/overlay';
+import Overlay from '@zero/services/overlay.js';
 import Axios from 'axios';
-import PasswordChangeOverlay from 'zero/pages/password-change';
-import EventHub from 'zero/services/eventhub';
+import PasswordChangeOverlay from '@zero/pages/password-change.vue';
+import EventHub from '@zero/services/eventhub.js';
 
 const data = {
   isAuthenticated: false,
diff --git a/zero.Web.UI/App/services/axios-helper.js b/zero.Web.UI/services/axios-helper.js
similarity index 100%
rename from zero.Web.UI/App/services/axios-helper.js
rename to zero.Web.UI/services/axios-helper.js
diff --git a/zero.Web.UI/App/services/debug.js b/zero.Web.UI/services/debug.js
similarity index 100%
rename from zero.Web.UI/App/services/debug.js
rename to zero.Web.UI/services/debug.js
diff --git a/zero.Web.UI/App/services/eventhub.js b/zero.Web.UI/services/eventhub.js
similarity index 100%
rename from zero.Web.UI/App/services/eventhub.js
rename to zero.Web.UI/services/eventhub.js
diff --git a/zero.Web.UI/App/services/localization.js b/zero.Web.UI/services/localization.js
similarity index 100%
rename from zero.Web.UI/App/services/localization.js
rename to zero.Web.UI/services/localization.js
diff --git a/zero.Web.UI/App/services/notification.js b/zero.Web.UI/services/notification.js
similarity index 95%
rename from zero.Web.UI/App/services/notification.js
rename to zero.Web.UI/services/notification.js
index b86af324..e77bfb17 100644
--- a/zero.Web.UI/App/services/notification.js
+++ b/zero.Web.UI/services/notification.js
@@ -1,4 +1,4 @@
-import Strings from 'zero/services/strings';
+import Strings from '@zero/services/strings.js';
 import { find as _find, extend as _extend } from 'underscore';
 
 let instances = [];
diff --git a/zero.Web.UI/App/services/objects.js b/zero.Web.UI/services/objects.js
similarity index 100%
rename from zero.Web.UI/App/services/objects.js
rename to zero.Web.UI/services/objects.js
diff --git a/zero.Web.UI/App/services/overlay.js b/zero.Web.UI/services/overlay.js
similarity index 93%
rename from zero.Web.UI/App/services/overlay.js
rename to zero.Web.UI/services/overlay.js
index 44b950ec..91c6206d 100644
--- a/zero.Web.UI/App/services/overlay.js
+++ b/zero.Web.UI/services/overlay.js
@@ -1,6 +1,6 @@
-import AppConfirm from 'zero/components/overlays/confirm';
-import Strings from 'zero/services/strings';
-import EventHub from 'zero/services/eventhub';
+import AppConfirm from '@zero/components/overlays/confirm.vue';
+import Strings from '@zero/services/strings.js';
+import EventHub from '@zero/services/eventhub.js';
 import { find as _find, extend as _extend } from 'underscore';
 
 let currentInstance = null;
diff --git a/zero.Web.UI/App/services/strings.js b/zero.Web.UI/services/strings.js
similarity index 100%
rename from zero.Web.UI/App/services/strings.js
rename to zero.Web.UI/services/strings.js
diff --git a/zero.Web.UI/App/services/url.js b/zero.Web.UI/services/url.js
similarity index 100%
rename from zero.Web.UI/App/services/url.js
rename to zero.Web.UI/services/url.js
diff --git a/zero.Web.UI/vite.config.js b/zero.Web.UI/vite.config.js
new file mode 100644
index 00000000..e3dc0be4
--- /dev/null
+++ b/zero.Web.UI/vite.config.js
@@ -0,0 +1,29 @@
+const aliases = Object.entries({
+  '@zero/': '/',
+  '@zerosetup/': '/setup/',
+  '@shop/': '/../zero.Commerce/Plugins/zero.Commerce/'
+});
+
+export default {
+
+  outDir: 'Assets/',
+
+  base: '/zero/vue-cli',
+
+  resolvers: [{
+    alias(path)
+    {
+      for (const [alias, resolved] of aliases) 
+      {
+        if (path.startsWith(alias)) 
+        {
+          return path.replace(alias, resolved);
+        }
+      }
+    }
+  }],
+
+  optimizeDeps: {
+    include: ["qs"],
+  },
+};
\ No newline at end of file
diff --git a/zero.Web.UI/wipe.js b/zero.Web.UI/wipe.js
deleted file mode 100644
index bbf58f9b..00000000
--- a/zero.Web.UI/wipe.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const fs = require('fs');
-
-const wipeDependencies = () =>
-{
-  const file = fs.readFileSync('package.json');
-  const content = JSON.parse(file);
-  for (const devDep in content.devDependencies)
-  {
-    content.devDependencies[devDep] = '*';
-  }
-  for (const dep in content.dependencies)
-  {
-    content.dependencies[dep] = '*';
-  }
-  fs.writeFileSync('package.json', JSON.stringify(content));
-};
-
-if (require.main === module)
-{
-  wipeDependencies();
-}
-else
-{
-  module.exports = wipeDependencies;
-}
\ No newline at end of file