diff --git a/packages/frontend/src/app.js b/packages/frontend/src/app.js
index 01395cc9b..59599e493 100644
--- a/packages/frontend/src/app.js
+++ b/packages/frontend/src/app.js
@@ -63,7 +63,7 @@ Vue.use(VueApexCharts)
 
 Vue.component('Apexchart', VueApexCharts)
 
-import { formatNumber } from './formatNumber'
+import { formatNumber } from './plugins/formatNumber'
 // Filter to turn any number into a nice string like '10k', '5.5m'
 // Accepts 'max' parameter to set it's formatting while being animated
 Vue.filter('prettynum', formatNumber)
diff --git a/packages/frontend/src/cleanup/components/admin/ActivityCard.vue b/packages/frontend/src/cleanup/components/admin/ActivityCard.vue
index 15aa92bf5..cf7d1ef85 100644
--- a/packages/frontend/src/cleanup/components/admin/ActivityCard.vue
+++ b/packages/frontend/src/cleanup/components/admin/ActivityCard.vue
@@ -15,7 +15,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import { formatNumber } from '@/formatNumber.js'
+import { formatNumber } from '@/plugins/formatNumber.js'
 
 export default {
   name: 'ActivityCard',
diff --git a/packages/frontend/src/cleanup/components/common/Viewer.vue b/packages/frontend/src/cleanup/components/common/Viewer.vue
index 9c77b768d..c22a445e7 100644
--- a/packages/frontend/src/cleanup/components/common/Viewer.vue
+++ b/packages/frontend/src/cleanup/components/common/Viewer.vue
@@ -92,18 +92,6 @@ export default {
   height: 100%;
 }
 
-.background-light {
-  background: #8e9eab;
-  background: -webkit-linear-gradient(to top right, #eeeeee, #c8e8ff);
-  background: linear-gradient(to top right, #ffffff, #c8e8ff);
-}
-
-.background-dark {
-  background: #141e30;
-  background: -webkit-linear-gradient(to top, #243b55, #141e30);
-  background: linear-gradient(to top, #243b55, #141e30);
-}
-
 #renderer {
   position: absolute;
   top: 0;
diff --git a/packages/frontend/src/components/GettingStartedSteps.vue b/packages/frontend/src/cleanup/components/onboarding/GettingStartedSteps.vue
similarity index 100%
rename from packages/frontend/src/components/GettingStartedSteps.vue
rename to packages/frontend/src/cleanup/components/onboarding/GettingStartedSteps.vue
diff --git a/packages/frontend/src/views/stream/Activity.vue b/packages/frontend/src/cleanup/components/stream/Activity.vue
similarity index 100%
rename from packages/frontend/src/views/stream/Activity.vue
rename to packages/frontend/src/cleanup/components/stream/Activity.vue
diff --git a/packages/frontend/src/cleanup/pages/auth/Auth.vue b/packages/frontend/src/cleanup/pages/auth/Auth.vue
index 5e80058bf..aabf99ca2 100644
--- a/packages/frontend/src/cleanup/pages/auth/Auth.vue
+++ b/packages/frontend/src/cleanup/pages/auth/Auth.vue
@@ -1,8 +1,5 @@
 <template>
-  <v-app
-    id="speckle-auth"
-    :class="`${$vuetify.theme.dark ? 'background-dark' : 'background-light'}`"
-  >
+  <v-app :class="`${$vuetify.theme.dark ? 'background-dark' : 'background-light'}`">
     <v-container fill-height fluid>
       <v-row align="center" justify="center">
         <v-col v-if="showBlurb" cols="12" md="6" lg="6" xl="4" class="hidden-sm-and-down">
@@ -31,7 +28,6 @@ export default {
   },
   computed: {
     showBlurb() {
-      // return true
       return this.$route.name === 'Login' || this.$route.name === 'Register'
     }
   },
@@ -53,16 +49,3 @@ export default {
   }
 }
 </script>
-<style scoped>
-.background-light {
-  background: #8e9eab;
-  background: -webkit-linear-gradient(to top right, #eeeeee, #c8e8ff);
-  background: linear-gradient(to top right, #ffffff, #c8e8ff);
-}
-
-.background-dark {
-  background: #141e30;
-  background: -webkit-linear-gradient(to top left, #243b55, #141e30);
-  background: linear-gradient(to top left, #243b55, #141e30);
-}
-</style>
diff --git a/packages/frontend/src/cleanup/pages/auth/ResetPasswordRequest.vue b/packages/frontend/src/cleanup/pages/auth/ResetPasswordRequest.vue
index 134826ee4..d17b3d22d 100644
--- a/packages/frontend/src/cleanup/pages/auth/ResetPasswordRequest.vue
+++ b/packages/frontend/src/cleanup/pages/auth/ResetPasswordRequest.vue
@@ -8,7 +8,9 @@
     </v-alert>
     <v-alert v-model="success" :icon="null" text>
       <v-row align="center">
-        <v-col class="grow">Done! We've sent you instructions on how to reset your password at {{ form.email }}.</v-col>
+        <v-col class="grow">
+          Done! We've sent you instructions on how to reset your password at {{ form.email }}.
+        </v-col>
       </v-row>
     </v-alert>
     <v-card-text v-if="!success" class="pb-7">
diff --git a/packages/frontend/src/views/Error.vue b/packages/frontend/src/cleanup/pages/common/Error.vue
similarity index 96%
rename from packages/frontend/src/views/Error.vue
rename to packages/frontend/src/cleanup/pages/common/Error.vue
index 39c5ce094..4d30835be 100644
--- a/packages/frontend/src/views/Error.vue
+++ b/packages/frontend/src/cleanup/pages/common/Error.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app id="speckle-auth">
+  <v-app :class="`${$vuetify.theme.dark ? 'background-dark' : 'background-light'}`">
     <v-container fill-height fluid>
       <v-row align="center" justify="center">
         <v-col cols="12" md="8">
diff --git a/packages/frontend/src/views/NotFound.vue b/packages/frontend/src/cleanup/pages/common/NotFound.vue
similarity index 84%
rename from packages/frontend/src/views/NotFound.vue
rename to packages/frontend/src/cleanup/pages/common/NotFound.vue
index 3576fb033..23796ab8f 100644
--- a/packages/frontend/src/views/NotFound.vue
+++ b/packages/frontend/src/cleanup/pages/common/NotFound.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app id="speckle-auth">
+  <v-app :class="`${$vuetify.theme.dark ? 'background-dark' : 'background-light'}`">
     <v-container fill-height fluid>
       <v-row align="center" justify="center">
         <v-col cols="12" md="8">
diff --git a/packages/frontend/src/views/GettingStartedView.vue b/packages/frontend/src/cleanup/pages/onboarding/Onboarding.vue
similarity index 90%
rename from packages/frontend/src/views/GettingStartedView.vue
rename to packages/frontend/src/cleanup/pages/onboarding/Onboarding.vue
index b2ae2a5cd..f3ea72420 100644
--- a/packages/frontend/src/views/GettingStartedView.vue
+++ b/packages/frontend/src/cleanup/pages/onboarding/Onboarding.vue
@@ -13,7 +13,7 @@
   </v-app>
 </template>
 <script>
-import GettingStartedSteps from '../components/GettingStartedSteps.vue'
+import GettingStartedSteps from '@/cleanup/components/onboarding/GettingStartedSteps.vue'
 export default {
   components: { GettingStartedSteps }
 }
diff --git a/packages/frontend/src/cleanup/pages/stream/StreamHome.vue b/packages/frontend/src/cleanup/pages/stream/StreamHome.vue
index 574e67837..aa8e6825e 100644
--- a/packages/frontend/src/cleanup/pages/stream/StreamHome.vue
+++ b/packages/frontend/src/cleanup/pages/stream/StreamHome.vue
@@ -92,7 +92,7 @@ export default {
     NoDataPlaceholder: () => import('@/cleanup/components/common/NoDataPlaceholder'),
     ListItemCommit: () => import('@/cleanup/components/stream/ListItemCommit'),
     PreviewImage: () => import('@/cleanup/components/common/PreviewImage'),
-    StreamActivity: () => import('@/views/stream/Activity')
+    StreamActivity: () => import('@/cleanup/components/stream/Activity')
   },
   data() {
     return {
diff --git a/packages/frontend/src/formatNumber.js b/packages/frontend/src/plugins/formatNumber.js
similarity index 100%
rename from packages/frontend/src/formatNumber.js
rename to packages/frontend/src/plugins/formatNumber.js
diff --git a/packages/frontend/src/router/index.js b/packages/frontend/src/router/index.js
index 89217b870..756c560dd 100644
--- a/packages/frontend/src/router/index.js
+++ b/packages/frontend/src/router/index.js
@@ -252,7 +252,7 @@ const routes = [
     meta: {
       title: 'Error | Speckle'
     },
-    component: () => import('@/views/Error.vue')
+    component: () => import('@/cleanup/pages/common/Error.vue')
   },
   {
     path: '/onboarding',
@@ -260,7 +260,7 @@ const routes = [
     meta: {
       title: 'Getting Started | Speckle'
     },
-    component: () => import('@/views/GettingStartedView.vue')
+    component: () => import('@/cleanup/pages/onboarding/Onboarding.vue')
   },
   {
     path: '*',
@@ -268,7 +268,7 @@ const routes = [
     meta: {
       title: 'Not Found | Speckle'
     },
-    component: () => import('@/views/NotFound.vue')
+    component: () => import('@/cleanup/pages/common/NotFound.vue')
   }
 ]
 
diff --git a/packages/frontend/src/sass/variables.scss b/packages/frontend/src/sass/variables.scss
index 41222adfb..1af20da3d 100644
--- a/packages/frontend/src/sass/variables.scss
+++ b/packages/frontend/src/sass/variables.scss
@@ -13,3 +13,16 @@ $primary-gradient: linear-gradient(0deg, $primary-darken 0%, $primary-base 40%);
   @include speckle-gradient-bg;
   -webkit-background-clip: text;
 }
+
+.background-light {
+  background: #8e9eab;
+  background: -webkit-linear-gradient(to top right, #eeeeee, #c8e8ff) !important;
+  background: linear-gradient(to top right, #ffffff, #c8e8ff) !important;
+}
+
+.background-dark {
+  background: #141e30;
+  background: -webkit-linear-gradient(to top left, #243b55, #141e30) !important;
+  background: linear-gradient(to top left, #243b55, #141e30) !important;
+}
+