diff --git a/zero.Web/App/Components/Tables/table.vue b/zero.Web/App/Components/Tables/table.vue
index 60744715..b6ad98c7 100644
--- a/zero.Web/App/Components/Tables/table.vue
+++ b/zero.Web/App/Components/Tables/table.vue
@@ -24,9 +24,8 @@
 
 
 <script>
-  import TableValueDirective from 'zerocomponents/Tables/table-value.js';
+  import TableValueDirective from './table-value.js';
   import UiPagination from 'zerocomponents/pagination.vue';
-  import Strings from 'zeroservices/strings';
   import { each as _each, extend as _extend } from 'underscore';
 
   const defaultConfig = {
diff --git a/zero.Web/App/Pages/register.js b/zero.Web/App/Pages/register.js
deleted file mode 100644
index 7a7f245b..00000000
--- a/zero.Web/App/Pages/register.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Globally register all pages for convenience, because they
-// will be used very frequently. Page components are registered using the
-// PascalCased version of their file name.
-
-import Vue from 'vue';
-
-
-// https://webpack.js.org/guides/dependency-management/#require-context
-const requireComponent = require.context(
-  // Look for files in the current directory
-  '.',
-  // Do look in subdirectories
-  true,
-  // .vue files
-  /[\w-]+\.vue$/
-);
-
-// For each matching file name...
-requireComponent.keys().forEach((path) =>
-{
-  let pathParts = path.split('/');
-  let fileName = pathParts[pathParts.length - 1];
-
-  // Get the component config
-  const componentConfig = requireComponent(path);
-  // Get the PascalCase version of the component name
-  const componentName = 'app' + fileName
-    // Remove the "./_" from the beginning
-    .replace(/^\.\/_/, '')
-    // Remove the file extension from the end
-    .replace(/\.\w+$/, '')
-    // Split up kebabs
-    .split('-')
-    // Upper case
-    .map((kebab) => kebab.charAt(0).toUpperCase() + kebab.slice(1))
-    // Concatenated
-    .join('');
-
-  // Globally register the component
-  Vue.component(componentName, componentConfig.default || componentConfig);
-});
\ No newline at end of file
diff --git a/zero.Web/App/Services/overlay.js b/zero.Web/App/Services/overlay.js
index f43505bb..bd0f2ef7 100644
--- a/zero.Web/App/Services/overlay.js
+++ b/zero.Web/App/Services/overlay.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import AppConfirm from 'zerocomponents/Overlays/confirm';
+import AppConfirm from 'zerocomponents/overlays/confirm';
 import Strings from 'zeroservices/strings';
 import { find as _find, extend as _extend } from 'underscore';
 
diff --git a/zero.Web/App/app.router.js b/zero.Web/App/app.router.js
index 3929d08f..46ce8e57 100644
--- a/zero.Web/App/app.router.js
+++ b/zero.Web/App/app.router.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import Localization from 'zeroservices/localization';
-import ViewDefault from 'zeropages/page';
+import ViewDefault from 'zeropages/pages/page';
 
 Vue.use(VueRouter);
 
@@ -24,13 +24,13 @@ let addSection = (section, component) =>
 
 zero.sections.forEach(section =>
 {
-  addSection(section, () => import('zeropages/' + section.alias));
+  addSection(section, () => import('zeropages/' + section.alias + '/' + section.alias));
 
   if (section.children.length > 0)
   {
     section.children.forEach(child =>
     {
-      addSection(child, () => import('zeropages/' + section.alias + '/' + child.alias));
+      addSection(child, () => import('zeropages/' + section.alias + '/' + section.alias + '/' + child.alias));
     });
   }
 });
diff --git a/zero.Web/App/app.vue b/zero.Web/App/app.vue
index f921fada..04d758a3 100644
--- a/zero.Web/App/app.vue
+++ b/zero.Web/App/app.vue
@@ -15,8 +15,8 @@
 <script>
   import '../Sass/app.scss'
   import AppNavigation from 'zero/navigation.vue'
-  import AppLogin from 'zeropages/login.vue'
-  import AppOverlays from 'zerocomponents/Overlays/overlay-holder.vue'
+  import AppLogin from 'zeropages/login/login.vue'
+  import AppOverlays from 'zerocomponents/overlays/overlay-holder.vue'
   import Router from 'zero/app.router.js'
   import AuthApi from 'zeroservices/auth.js'
   import 'zero/axios.config.js'
diff --git a/zero.Web/App/Pages/lists.vue b/zero.Web/App/pages/lists/lists.vue
similarity index 100%
rename from zero.Web/App/Pages/lists.vue
rename to zero.Web/App/pages/lists/lists.vue
diff --git a/zero.Web/App/Pages/login.vue b/zero.Web/App/pages/login/login.vue
similarity index 100%
rename from zero.Web/App/Pages/login.vue
rename to zero.Web/App/pages/login/login.vue
diff --git a/zero.Web/App/Pages/page.vue b/zero.Web/App/pages/pages/page.vue
similarity index 100%
rename from zero.Web/App/Pages/page.vue
rename to zero.Web/App/pages/pages/page.vue
diff --git a/zero.Web/App/Pages/settings.vue b/zero.Web/App/pages/settings/settings.vue
similarity index 100%
rename from zero.Web/App/Pages/settings.vue
rename to zero.Web/App/pages/settings/settings.vue
diff --git a/zero.Web/Setup/setup.vue b/zero.Web/Setup/setup.vue
index 7c6b58fc..a5dab888 100644
--- a/zero.Web/Setup/setup.vue
+++ b/zero.Web/Setup/setup.vue
@@ -14,7 +14,7 @@
 
 <script>
   import Sass from '../Sass/setup.scss'
-  import UiButton from 'zerocomponents/Buttons/button.vue'
+  import UiButton from 'zerocomponents/buttons/button.vue'
   import StepUser from './Steps/step-user.vue'
   import StepApplication from './Steps/step-application.vue'
   import StepDatabase from './Steps/step-database.vue'