diff --git a/frontend/projects/ui/src/app/app.module.ts b/frontend/projects/ui/src/app/app.module.ts
index 2e4bd2d2f..62a87ffd6 100644
--- a/frontend/projects/ui/src/app/app.module.ts
+++ b/frontend/projects/ui/src/app/app.module.ts
@@ -19,10 +19,9 @@ import {
 } from '@start9labs/shared'
 
 import { AppComponent } from './app.component'
-import { AppRoutingModule } from './app-routing.module'
+import { RoutingModule } from './routing.module'
 import { OSWelcomePageModule } from './modals/os-welcome/os-welcome.module'
 import { GenericInputComponentModule } from './modals/generic-input/generic-input.component.module'
-import { MarketplaceModule } from './marketplace.module'
 import { PreloaderModule } from './app/preloader/preloader.module'
 import { FooterModule } from './app/footer/footer.module'
 import { MenuModule } from './app/menu/menu.module'
@@ -31,7 +30,7 @@ import { APP_PROVIDERS } from './app.providers'
 import { PatchDbModule } from './services/patch-db/patch-db.module'
 import { ToastContainerModule } from './components/toast-container/toast-container.module'
 import { ConnectionBarComponentModule } from './components/connection-bar/connection-bar.component.module'
-import { WidgetsPageModule } from './pages/widgets/widgets.module'
+import { WidgetsPageModule } from 'src/app/apps/ui/pages/widgets/widgets.module'
 import { ServiceWorkerModule } from '@angular/service-worker'
 import { environment } from '../environments/environment'
 import { LoadingModule } from './modals/loading/loading.module'
@@ -45,7 +44,7 @@ import { FormPageModule } from './modals/form/form.module'
     IonicModule.forRoot({
       mode: 'md',
     }),
-    AppRoutingModule,
+    RoutingModule,
     MenuModule,
     PreloaderModule,
     FooterModule,
@@ -55,7 +54,6 @@ import { FormPageModule } from './modals/form/form.module'
     GenericInputComponentModule,
     MonacoEditorModule,
     SharedPipesModule,
-    MarketplaceModule,
     PatchDbModule,
     ToastContainerModule,
     ConnectionBarComponentModule,
diff --git a/frontend/projects/ui/src/app/app.providers.ts b/frontend/projects/ui/src/app/app.providers.ts
index 67b8e38b5..9bcbfbb0f 100644
--- a/frontend/projects/ui/src/app/app.providers.ts
+++ b/frontend/projects/ui/src/app/app.providers.ts
@@ -13,6 +13,7 @@ import {
   TUI_DATE_VALUE_TRANSFORMER,
 } from '@taiga-ui/kit'
 import { RELATIVE_URL, THEME, WorkspaceConfig } from '@start9labs/shared'
+import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { ApiService } from './services/api/embassy-api.service'
 import { MockApiService } from './services/api/embassy-mock-api.service'
 import { LiveApiService } from './services/api/embassy-live-api.service'
@@ -22,6 +23,7 @@ import { FilterPackagesPipe } from '../../../marketplace/src/pipes/filter-packag
 import { ThemeSwitcherService } from './services/theme-switcher.service'
 import { DateTransformerService } from './services/date-transformer.service'
 import { DatetimeTransformerService } from './services/datetime-transformer.service'
+import { MarketplaceService } from './services/marketplace.service'
 
 const {
   useMocks,
@@ -73,6 +75,10 @@ export const APP_PROVIDERS: Provider[] = [
     provide: THEME,
     useExisting: ThemeSwitcherService,
   },
+  {
+    provide: AbstractMarketplaceService,
+    useClass: MarketplaceService,
+  },
 ]
 
 export function appInitializer(
diff --git a/frontend/projects/ui/src/app/app/footer/footer.component.ts b/frontend/projects/ui/src/app/app/footer/footer.component.ts
index 9a16f5a47..bad7fcc3b 100644
--- a/frontend/projects/ui/src/app/app/footer/footer.component.ts
+++ b/frontend/projects/ui/src/app/app/footer/footer.component.ts
@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { heightCollapse } from '../../util/animations'
+import { heightCollapse } from 'src/app/util/animations'
 import { PatchDB } from 'patch-db-client'
 import { map } from 'rxjs/operators'
-import { DataModel } from '../../services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'footer[appFooter]',
diff --git a/frontend/projects/ui/src/app/app/menu/menu.component.ts b/frontend/projects/ui/src/app/app/menu/menu.component.ts
index 256cd4ef9..6cd2fb003 100644
--- a/frontend/projects/ui/src/app/app/menu/menu.component.ts
+++ b/frontend/projects/ui/src/app/app/menu/menu.component.ts
@@ -4,7 +4,7 @@ import {
   inject,
   Inject,
 } from '@angular/core'
-import { EOSService } from '../../services/eos.service'
+import { EOSService } from 'src/app/services/eos.service'
 import { PatchDB } from 'patch-db-client'
 import {
   combineLatest,
diff --git a/frontend/projects/ui/src/app/app/snek/snek.directive.ts b/frontend/projects/ui/src/app/app/snek/snek.directive.ts
index 39f08f39b..f056e93e5 100644
--- a/frontend/projects/ui/src/app/app/snek/snek.directive.ts
+++ b/frontend/projects/ui/src/app/app/snek/snek.directive.ts
@@ -1,8 +1,8 @@
 import { Directive, HostListener, Input } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
 import { ErrorToastService } from '@start9labs/shared'
-import { SnakePage } from '../../modals/snake/snake.page'
-import { ApiService } from '../../services/api/embassy-api.service'
+import { SnakePage } from 'src/app/modals/snake/snake.page'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Directive({
   selector: 'img[appSnek]',
diff --git a/frontend/projects/ui/src/app/app/snek/snek.module.ts b/frontend/projects/ui/src/app/app/snek/snek.module.ts
index f01c59c35..990192afa 100644
--- a/frontend/projects/ui/src/app/app/snek/snek.module.ts
+++ b/frontend/projects/ui/src/app/app/snek/snek.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core'
 
-import { SnakePageModule } from '../../modals/snake/snake.module'
+import { SnakePageModule } from 'src/app/modals/snake/snake.module'
 import { SnekDirective } from './snek.directive'
 
 @NgModule({
diff --git a/frontend/projects/ui/src/app/apps/loading/loading.module.ts b/frontend/projects/ui/src/app/apps/loading/loading.module.ts
new file mode 100644
index 000000000..9c7ae1bc9
--- /dev/null
+++ b/frontend/projects/ui/src/app/apps/loading/loading.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { LoadingModule } from '@start9labs/shared'
+import { LoadingPage } from './loading.page'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: LoadingPage,
+  },
+]
+
+@NgModule({
+  imports: [LoadingModule, RouterModule.forChild(routes)],
+  declarations: [LoadingPage],
+})
+export class LoadingPageModule {}
diff --git a/frontend/projects/ui/src/app/apps/loading/loading.page.html b/frontend/projects/ui/src/app/apps/loading/loading.page.html
new file mode 100644
index 000000000..5b9740f3d
--- /dev/null
+++ b/frontend/projects/ui/src/app/apps/loading/loading.page.html
@@ -0,0 +1,4 @@
+<app-loading
+  class="ion-page"
+  (finished)="navCtrl.navigateForward('/login')"
+></app-loading>
diff --git a/frontend/projects/ui/src/app/apps/loading/loading.page.ts b/frontend/projects/ui/src/app/apps/loading/loading.page.ts
new file mode 100644
index 000000000..14fcbeb22
--- /dev/null
+++ b/frontend/projects/ui/src/app/apps/loading/loading.page.ts
@@ -0,0 +1,19 @@
+import { Component, inject } from '@angular/core'
+import { NavController } from '@ionic/angular'
+import {
+  provideSetupLogsService,
+  provideSetupService,
+} from '@start9labs/shared'
+
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+
+@Component({
+  templateUrl: 'loading.page.html',
+  providers: [
+    provideSetupService(ApiService),
+    provideSetupLogsService(ApiService),
+  ],
+})
+export class LoadingPage {
+  readonly navCtrl = inject(NavController)
+}
diff --git a/frontend/projects/ui/src/app/pages/login/login.module.ts b/frontend/projects/ui/src/app/apps/login/login.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/login/login.module.ts
rename to frontend/projects/ui/src/app/apps/login/login.module.ts
index 937eb4885..93558f8ec 100644
--- a/frontend/projects/ui/src/app/pages/login/login.module.ts
+++ b/frontend/projects/ui/src/app/apps/login/login.module.ts
@@ -3,8 +3,8 @@ import { RouterModule, Routes } from '@angular/router'
 import { CommonModule } from '@angular/common'
 import { FormsModule } from '@angular/forms'
 import { IonicModule } from '@ionic/angular'
-import { LoginPage } from './login.page'
 import { SharedPipesModule } from '@start9labs/shared'
+import { LoginPage } from './login.page'
 
 const routes: Routes = [
   {
diff --git a/frontend/projects/ui/src/app/pages/login/login.page.html b/frontend/projects/ui/src/app/apps/login/login.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/login/login.page.html
rename to frontend/projects/ui/src/app/apps/login/login.page.html
diff --git a/frontend/projects/ui/src/app/pages/login/login.page.scss b/frontend/projects/ui/src/app/apps/login/login.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/login/login.page.scss
rename to frontend/projects/ui/src/app/apps/login/login.page.scss
diff --git a/frontend/projects/ui/src/app/pages/login/login.page.ts b/frontend/projects/ui/src/app/apps/login/login.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/login/login.page.ts
rename to frontend/projects/ui/src/app/apps/login/login.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions-item.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions-item.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions-item.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-actions/app-actions.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces-item.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-interfaces/app-interfaces.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/app-list.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts
similarity index 89%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts
index 76712e4a3..504127ab7 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/package-info.pipe.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-list/package-info.pipe.ts
@@ -5,7 +5,7 @@ import {
   DataModel,
   PackageDataEntry,
 } from 'src/app/services/patch-db/data-model'
-import { getPackageInfo, PkgInfo } from '../../../util/get-package-info'
+import { getPackageInfo, PkgInfo } from 'src/app/util/get-package-info'
 import { PatchDB } from 'patch-db-client'
 
 @Pipe({
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-logs/app-logs.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.html
similarity index 95%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.html
index 11599777b..ca3cdd3be 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.html
@@ -24,10 +24,9 @@
     <ion-item *ngIf="stopped$ | async" class="ion-margin-bottom">
       <ion-label>
         <p>
-          <ion-text color="warning"
-            >Service is stopped. Information on this page could be
-            inaccurate.</ion-text
-          >
+          <ion-text color="warning">
+            Service is stopped. Information on this page could be inaccurate.
+          </ion-text>
         </p>
       </ion-label>
     </ion-item>
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-properties/app-properties.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.module.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/app-show.page.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-dependencies/app-show-dependencies.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-header/app-show-header.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
similarity index 97%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
index 1bc50c0fa..209056834 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.html
@@ -43,8 +43,8 @@
               <span *ngIf="result === 'loading'">
                 {{ $any(check).message }}
               </span>
-              <span *ngIf="result === 'success'"
-                >:
+              <span *ngIf="result === 'success'">
+                :
                 {{ $any(check).message }}
               </span>
             </p>
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-menu/app-show-menu.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.scss
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/health-color.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/health-color.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/progress-data.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-dependencies.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-status.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-status.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-status.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/app-show/pipes/to-status.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/apps-routes/apps-routing.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/apps-routes/apps-routing.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/apps-routes/apps-routing.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/backups-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/backups-routing.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/backups-routing.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/backups-routing.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/components/backing-up/backing-up.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/components/backing-up/backing-up.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/components/backing-up/backing-up.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/components/backing-up/backing-up.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/components/backing-up/backing-up.component.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/directives/backup-create.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts
similarity index 94%
rename from frontend/projects/ui/src/app/pages/backups-routes/directives/backup-create.directive.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts
index 1343707d6..1f4fa3059 100644
--- a/frontend/projects/ui/src/app/pages/backups-routes/directives/backup-create.directive.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-create.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, HostListener } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { BackupSelectPage } from 'src/app/pages/backups-routes/modals/backup-select/backup-select.page'
+import { BackupSelectPage } from 'src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page'
 import { TargetSelectPage } from '../modals/target-select/target-select.page'
 import {
   CifsBackupTarget,
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/directives/backup-restore.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts
similarity index 96%
rename from frontend/projects/ui/src/app/pages/backups-routes/directives/backup-restore.directive.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts
index da9178fb3..f0f204ce4 100644
--- a/frontend/projects/ui/src/app/pages/backups-routes/directives/backup-restore.directive.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/directives/backup-restore.directive.ts
@@ -10,7 +10,7 @@ import {
   GenericInputOptions,
 } from 'src/app/modals/generic-input/generic-input.component'
 import { BackupInfo, BackupTarget } from 'src/app/services/api/api.types'
-import { RecoverSelectPage } from 'src/app/pages/backups-routes/modals/recover-select/recover-select.page'
+import { RecoverSelectPage } from 'src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page'
 import * as argon2 from '@start9labs/argon2'
 import { TargetSelectPage } from '../modals/target-select/target-select.page'
 
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/backup-select/backup-select.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/backup-select/backup-select.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/recover-select.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/recover-select.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/to-options.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/to-options.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/recover-select/to-options.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/recover-select/to-options.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.html
similarity index 89%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.html
index b4cf91e06..ea2a34953 100644
--- a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.html
@@ -1,8 +1,8 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title
-      >Select Backup {{ type === 'create' ? 'Target' : 'Source' }}</ion-title
-    >
+    <ion-title>
+      Select Backup {{ type === 'create' ? 'Target' : 'Source' }}
+    </ion-title>
     <ion-buttons slot="end">
       <ion-button (click)="dismiss()">
         <ion-icon slot="icon-only" name="close"></ion-icon>
@@ -48,7 +48,7 @@
 
       <div *ngIf="!targets.length" class="ion-text-center ion-padding-top">
         <h2 class="ion-padding-bottom">No saved targets</h2>
-        <ion-button (click)="goToTargets()"> Go to Targets </ion-button>
+        <ion-button (click)="goToTargets()">Go to Targets</ion-button>
       </div>
     </ion-item-group>
   </ng-template>
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-select.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-select.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-status.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/modals/target-select/target-status.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/modals/target-select/target-status.component.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-history/backup-history.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-history/backup-history.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/backup-jobs.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/edit-job/edit-job.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html
similarity index 71%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html
index 4e453c046..b220b7ead 100644
--- a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.html
@@ -9,18 +9,18 @@
   <ion-label>
     <h2>Target</h2>
   </ion-label>
-  <ion-note slot="end" color="success">{{
-    job.target.type || 'Select target'
-  }}</ion-note>
+  <ion-note slot="end" color="success">
+    {{ job.target.type || 'Select target' }}
+  </ion-note>
 </ion-item>
 
 <ion-item button (click)="presentModalPackages()">
   <ion-label>
     <h2>Packages</h2>
   </ion-label>
-  <ion-note slot="end" color="success">{{
-    job['package-ids'].length + ' selected'
-  }}</ion-note>
+  <ion-note slot="end" color="success">
+    {{ job['package-ids'].length + ' selected' }}
+  </ion-note>
 </ion-item>
 
 <div class="ion-padding-start">
@@ -29,6 +29,6 @@
     <ion-input placeholder="* * * * *" [(ngModel)]="job.cron"></ion-input>
   </ion-item>
   <p *ngIf="job.cron | toHumanCron as human" style="padding-left: 6px">
-    <ion-text [color]="human.color"> {{ human.message }} </ion-text>
+    <ion-text [color]="human.color">{{ human.message }}</ion-text>
   </p>
 </div>
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/job-options/job-options.component.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/new-job/new-job.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/pipes.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/pipes.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-jobs/pipes.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-jobs/pipes.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts
similarity index 96%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts
index 01df98a8b..8e4e8b4f4 100644
--- a/frontend/projects/ui/src/app/pages/backups-routes/pages/backup-targets/backup-targets.page.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backup-targets/backup-targets.page.ts
@@ -16,9 +16,9 @@ import {
 import { BehaviorSubject, filter } from 'rxjs'
 import { TuiDialogService } from '@taiga-ui/core'
 import { ErrorService } from '@start9labs/shared'
-import { FormDialogService } from '../../../../services/form-dialog.service'
-import { FormPage } from '../../../../modals/form/form.page'
-import { LoadingService } from '../../../../modals/loading/loading.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
+import { FormPage } from 'src/app/modals/form/form.page'
+import { LoadingService } from 'src/app/modals/loading/loading.service'
 import { TUI_PROMPT } from '@taiga-ui/kit'
 import { configBuilderToSpec } from 'src/app/util/configBuilderToSpec'
 import {
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.html b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.html
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.scss
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pages/backups/backups.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pages/backups/backups.page.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pipes/get-display-info.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/get-display-info.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pipes/get-display-info.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/get-display-info.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pipes/has-valid-backup.pipe.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/has-valid-backup.pipe.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pipes/has-valid-backup.pipe.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/has-valid-backup.pipe.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/pipes/target-pipes.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/target-pipes.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/pipes/target-pipes.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/pipes/target-pipes.module.ts
diff --git a/frontend/projects/ui/src/app/pages/backups-routes/types/target-types.ts b/frontend/projects/ui/src/app/apps/ui/pages/backups-routes/types/target-types.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/backups-routes/types/target-types.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/backups-routes/types/target-types.ts
diff --git a/frontend/projects/ui/src/app/pages/home/home.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/home/home.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/home/home.module.ts
diff --git a/frontend/projects/ui/src/app/pages/home/home.page.html b/frontend/projects/ui/src/app/apps/ui/pages/home/home.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/home/home.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/home/home.page.html
diff --git a/frontend/projects/ui/src/app/pages/home/home.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/home/home.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/home/home.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/home/home.page.scss
diff --git a/frontend/projects/ui/src/app/pages/home/home.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/home/home.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/home/home.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/home/home.page.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.module.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.scss
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-routing.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-routing.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-routing.module.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-components.module.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.component.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-controls/marketplace-show-controls.page.scss
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.scss
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-dependent/marketplace-show-dependent.component.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/components/marketplace-show-header/marketplace-show-header.component.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.module.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
similarity index 77%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
index 8108754ee..15837d03d 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.html
@@ -1,13 +1,13 @@
 <ng-container *ngIf="localPkg" [ngSwitch]="localPkg.state">
   <div *ngSwitchCase="PackageState.Installed">
     <ion-text
-      *ngIf="(version | compareEmver: localVersion) !== 1"
+      *ngIf="(version | compareEmver : localVersion) !== 1"
       color="primary"
     >
       Installed
     </ion-text>
     <ion-text
-      *ngIf="(version | compareEmver: localVersion) === 1"
+      *ngIf="(version | compareEmver : localVersion) === 1"
       color="success"
     >
       Update Available
@@ -25,7 +25,8 @@
       color="primary"
     >
       Installing
-      <span class="loading-dots"></span>{{ progress }}
+      <span class="loading-dots"></span>
+      {{ progress }}
     </ion-text>
   </div>
 </ng-container>
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.scss
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.component.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
similarity index 83%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
index 8a7151f40..2d3675f02 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/marketplace-status/marketplace-status.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'
 import { IonicModule } from '@ionic/angular'
 import { EmverPipesModule } from '@start9labs/shared'
 
-import { InstallProgressPipeModule } from '../../../pipes/install-progress/install-progress.module'
+import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 import { MarketplaceStatusComponent } from './marketplace-status.component'
 
 @NgModule({
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.module.ts
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.page.html b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.html
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/marketplace-routes/release-notes/release-notes.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/marketplace-routes/release-notes/release-notes.page.ts
diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/notifications/notifications.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.module.ts
diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.page.html b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/notifications/notifications.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.html
diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/notifications/notifications.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.scss
diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/notifications/notifications.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/notifications/notifications.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/email/email.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/email/email.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/email/email.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/email/email.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/email/email.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/email/email.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/email/email.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts
similarity index 96%
rename from frontend/projects/ui/src/app/pages/server-routes/email/email.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts
index f55682b87..9260a57ae 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/email/email.page.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/email/email.page.ts
@@ -4,7 +4,7 @@ import { ErrorService } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { FormService } from 'src/app/services/form.service'
-import { LoadingService } from '../../../modals/loading/loading.service'
+import { LoadingService } from 'src/app/modals/loading/loading.service'
 import { TuiDialogService } from '@taiga-ui/core'
 import { switchMap } from 'rxjs/operators'
 import { InputSpec } from '@start9labs/start-sdk/lib/config/configTypes'
diff --git a/frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/kernel-logs/kernel-logs.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/kernel-logs/kernel-logs.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/lan/lan.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/lan/lan.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-logs/server-logs.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.html
similarity index 94%
rename from frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.html
index beb137f26..47cac26ef 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.html
@@ -31,9 +31,14 @@
       <ion-item>
         <ion-label>Uptime</ion-label>
         <h6 *ngIf="timeInfo.systemUptime as uptime" slot="end">
-          <b>{{ uptime.days }}</b> Days, <b>{{ uptime.hours }}</b> Hours,
-          <b>{{ uptime.minutes }}</b> Minutes,
-          <b>{{ uptime.seconds }}</b> Seconds
+          <b>{{ uptime.days }}</b>
+          Days,
+          <b>{{ uptime.hours }}</b>
+          Hours,
+          <b>{{ uptime.minutes }}</b>
+          Minutes,
+          <b>{{ uptime.seconds }}</b>
+          Seconds
         </h6>
       </ion-item>
     </ng-container>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-metrics/server-metrics.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-routing.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-routing.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-routing.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts
similarity index 99%
rename from frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts
index 556f67372..624810770 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-show/server-show.page.ts
@@ -14,7 +14,7 @@ import { ErrorToastService } from '@start9labs/shared'
 import { EOSService } from 'src/app/services/eos.service'
 import { ClientStorageService } from 'src/app/services/client-storage.service'
 import { OSUpdatePage } from 'src/app/modals/os-update/os-update.page'
-import { getAllPackages } from '../../../util/get-package-data'
+import { getAllPackages } from 'src/app/util/get-package-data'
 import { AuthService } from 'src/app/services/auth.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import {
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/server-specs/server-specs.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sessions/sessions.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/dnd.directive.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/dnd.directive.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sideload/dnd.directive.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/dnd.directive.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/sideload/sideload.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/ssh-keys/ssh-keys.page.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.component.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.ts
similarity index 86%
rename from frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.ts
index 0af1672fd..dc8e0e329 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.component.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 
-import { ThemeSwitcherService } from '../../../services/theme-switcher.service'
+import { ThemeSwitcherService } from 'src/app/services/theme-switcher.service'
 
 @Component({
   selector: 'theme-switcher',
diff --git a/frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/theme-switcher/theme-switcher.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/theme-switcher/theme-switcher.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.const.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.const.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.const.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.const.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.module.ts
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.html
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.scss
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/server-routes/wifi/wifi.page.ts
diff --git a/frontend/projects/ui/src/app/pages/updates/updates.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts
similarity index 98%
rename from frontend/projects/ui/src/app/pages/updates/updates.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts
index e07e798b4..eb4ac82da 100644
--- a/frontend/projects/ui/src/app/pages/updates/updates.module.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.module.ts
@@ -2,10 +2,8 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { IonicModule } from '@ionic/angular'
 import { RouterModule, Routes } from '@angular/router'
-import { FilterUpdatesPipe, UpdatesPage } from './updates.page'
 import { BadgeMenuComponentModule } from 'src/app/components/badge-menu-button/badge-menu.component.module'
 import {
-  EmverDisplayPipe,
   EmverPipesModule,
   MarkdownPipeModule,
   SharedPipesModule,
@@ -15,6 +13,7 @@ import { RoundProgressModule } from 'angular-svg-round-progressbar'
 import { InstallProgressPipeModule } from 'src/app/pipes/install-progress/install-progress.module'
 import { StoreIconComponentModule } from 'src/app/components/store-icon/store-icon.component.module'
 import { MimeTypePipeModule } from '@start9labs/marketplace'
+import { FilterUpdatesPipe, UpdatesPage } from './updates.page'
 
 const routes: Routes = [
   {
diff --git a/frontend/projects/ui/src/app/pages/updates/updates.page.html b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/updates/updates.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.html
diff --git a/frontend/projects/ui/src/app/pages/updates/updates.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/updates/updates.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.scss
diff --git a/frontend/projects/ui/src/app/pages/updates/updates.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/updates/updates.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/updates/updates.page.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.html
similarity index 71%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.html
index 2765f3372..bef3063ad 100644
--- a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.html
+++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.html
@@ -1,6 +1,9 @@
 <div *ngIf="installed$ | async as installed" class="wrapper">
   <button
-    *ngFor="let widget of widgets | tuiFilter: filter:installed; empty: empty"
+    *ngFor="
+      let widget of widgets | tuiFilter : filter : installed;
+      empty: empty
+    "
     class="button"
     (click)="context.completeWith(widget)"
   >
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.ts
similarity index 93%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.ts
index 68942709c..40ae052a2 100644
--- a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.component.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core'
 import { PatchDB } from 'patch-db-client'
-import { Widget } from '../../../../services/patch-db/data-model'
+import { Widget } from 'src/app/services/patch-db/data-model'
 import {
   POLYMORPHEUS_CONTEXT,
   PolymorpheusComponent,
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/add/add.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/add/add.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/add/add.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.component.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/favorites/favorites.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/favorites/favorites.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts
similarity index 95%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts
index 0da0b17af..0544e3916 100644
--- a/frontend/projects/ui/src/app/pages/widgets/built-in/health/health.component.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.component.ts
@@ -3,7 +3,7 @@ import { PatchDB } from 'patch-db-client'
 import { map } from 'rxjs/operators'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { PrimaryStatus } from 'src/app/services/pkg-status-rendering.service'
-import { getPackageInfo, PkgInfo } from '../../../../util/get-package-info'
+import { getPackageInfo, PkgInfo } from 'src/app/util/get-package-info'
 
 @Component({
   selector: 'widget-health',
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/health/health.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/health/health.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/health/health.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.component.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/metrics/metrics.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/metrics/metrics.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/network/network.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.component.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/network/network.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/network/network.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/network/network.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.component.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.component.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/uptime/uptime.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/uptime/uptime.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/built-in/widgets.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/widgets.ts
similarity index 92%
rename from frontend/projects/ui/src/app/pages/widgets/built-in/widgets.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/widgets.ts
index ec6e46db6..8b94a37aa 100644
--- a/frontend/projects/ui/src/app/pages/widgets/built-in/widgets.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/built-in/widgets.ts
@@ -1,4 +1,4 @@
-import { Widget } from '../../../services/patch-db/data-model'
+import { Widget } from 'src/app/services/patch-db/data-model'
 
 export const BUILT_IN_WIDGETS: readonly Widget[] = [
   {
diff --git a/frontend/projects/ui/src/app/pages/widgets/widgets.module.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.module.ts
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/widgets.module.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.module.ts
diff --git a/frontend/projects/ui/src/app/pages/widgets/widgets.page.html b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.html
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/widgets.page.html
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.html
diff --git a/frontend/projects/ui/src/app/pages/widgets/widgets.page.scss b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.scss
similarity index 100%
rename from frontend/projects/ui/src/app/pages/widgets/widgets.page.scss
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.scss
diff --git a/frontend/projects/ui/src/app/pages/widgets/widgets.page.ts b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts
similarity index 95%
rename from frontend/projects/ui/src/app/pages/widgets/widgets.page.ts
rename to frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts
index ca1541269..7992c90a1 100644
--- a/frontend/projects/ui/src/app/pages/widgets/widgets.page.ts
+++ b/frontend/projects/ui/src/app/apps/ui/pages/widgets/widgets.page.ts
@@ -13,8 +13,8 @@ import {
   PolymorpheusComponent,
 } from '@tinkoff/ng-polymorpheus'
 import { PatchDB } from 'patch-db-client'
-import { DataModel, Widget } from '../../services/patch-db/data-model'
-import { ApiService } from '../../services/api/embassy-api.service'
+import { DataModel, Widget } from 'src/app/services/patch-db/data-model'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ADD_WIDGET } from './built-in/add/add.component'
 import { FavoritesComponent } from './built-in/favorites/favorites.component'
 import { HealthComponent } from './built-in/health/health.component'
diff --git a/frontend/projects/ui/src/app/app-routing.module.ts b/frontend/projects/ui/src/app/apps/ui/ui.module.ts
similarity index 55%
rename from frontend/projects/ui/src/app/app-routing.module.ts
rename to frontend/projects/ui/src/app/apps/ui/ui.module.ts
index cf4883108..458e78741 100644
--- a/frontend/projects/ui/src/app/app-routing.module.ts
+++ b/frontend/projects/ui/src/app/apps/ui/ui.module.ts
@@ -1,30 +1,19 @@
 import { NgModule } from '@angular/core'
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router'
-import { AuthGuard } from './guards/auth.guard'
-import { UnauthGuard } from './guards/unauth.guard'
+import { RouterModule, Routes } from '@angular/router'
 
-const routes: Routes = [
+const ROUTES: Routes = [
   {
     redirectTo: 'services',
     pathMatch: 'full',
     path: '',
   },
-  {
-    path: 'login',
-    canActivate: [UnauthGuard],
-    loadChildren: () =>
-      import('./pages/login/login.module').then(m => m.LoginPageModule),
-  },
   {
     path: 'home',
-    canActivate: [AuthGuard],
     loadChildren: () =>
       import('./pages/home/home.module').then(m => m.HomePageModule),
   },
   {
     path: 'system',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/server-routes/server-routing.module').then(
         m => m.ServerRoutingModule,
@@ -32,15 +21,11 @@ const routes: Routes = [
   },
   {
     path: 'updates',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/updates/updates.module').then(m => m.UpdatesPageModule),
   },
   {
     path: 'marketplace',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/marketplace-routes/marketplace-routing.module').then(
         m => m.MarketplaceRoutingModule,
@@ -48,7 +33,6 @@ const routes: Routes = [
   },
   {
     path: 'notifications',
-    canActivate: [AuthGuard],
     loadChildren: () =>
       import('./pages/notifications/notifications.module').then(
         m => m.NotificationsPageModule,
@@ -56,8 +40,6 @@ const routes: Routes = [
   },
   {
     path: 'services',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/apps-routes/apps-routing.module').then(
         m => m.AppsRoutingModule,
@@ -65,8 +47,6 @@ const routes: Routes = [
   },
   {
     path: 'backups',
-    canActivate: [AuthGuard],
-    canActivateChild: [AuthGuard],
     loadChildren: () =>
       import('./pages/backups-routes/backups-routing.module').then(
         m => m.BackupsRoutingModule,
@@ -75,13 +55,6 @@ const routes: Routes = [
 ]
 
 @NgModule({
-  imports: [
-    RouterModule.forRoot(routes, {
-      scrollPositionRestoration: 'enabled',
-      preloadingStrategy: PreloadAllModules,
-      initialNavigation: 'disabled',
-    }),
-  ],
-  exports: [RouterModule],
+  imports: [RouterModule.forChild(ROUTES)],
 })
-export class AppRoutingModule {}
+export class UiModule {}
diff --git a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts b/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
index 3f91da5c4..b66d721ae 100644
--- a/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
+++ b/frontend/projects/ui/src/app/components/badge-menu-button/badge-menu.component.ts
@@ -3,7 +3,7 @@ import { SplitPaneTracker } from 'src/app/services/split-pane.service'
 import { PatchDB } from 'patch-db-client'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { TuiDialogService } from '@taiga-ui/core'
-import { WIDGETS_COMPONENT } from '../../pages/widgets/widgets.page'
+import { WIDGETS_COMPONENT } from 'src/app/apps/ui/pages/widgets/widgets.page'
 import { WorkspaceConfig } from '@start9labs/shared'
 import {
   ClientStorageService,
diff --git a/frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts b/frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts
index 68377b9be..f65f55d24 100644
--- a/frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts
+++ b/frontend/projects/ui/src/app/components/form/form-array/form-array.component.ts
@@ -10,7 +10,7 @@ import {
 import { TUI_PROMPT } from '@taiga-ui/kit'
 import { filter, takeUntil } from 'rxjs'
 import { ValueSpecList } from '@start9labs/start-sdk/lib/config/configTypes'
-import { FormService } from '../../../services/form.service'
+import { FormService } from 'src/app/services/form.service'
 import { ERRORS } from '../form-group/form-group.component'
 
 @Component({
diff --git a/frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts b/frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts
index 6be9d19bb..2b5b1c8a7 100644
--- a/frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts
+++ b/frontend/projects/ui/src/app/components/form/form-text/form-text.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { ValueSpecText } from '@start9labs/start-sdk/lib/config/configTypes'
 import { Control } from '../control'
-import { getDefaultString } from '../../../util/config-utilities'
+import { getDefaultString } from 'src/app/util/config-utilities'
 
 @Component({
   selector: 'form-text',
diff --git a/frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts b/frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts
index 1898d8212..6e8251df8 100644
--- a/frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts
+++ b/frontend/projects/ui/src/app/components/form/form-union/form-union.component.ts
@@ -12,7 +12,7 @@ import {
   ValueSpecUnion,
   unionValueKey,
 } from '@start9labs/start-sdk/lib/config/configTypes'
-import { FormService } from '../../../services/form.service'
+import { FormService } from 'src/app/services/form.service'
 import { tuiPure } from '@taiga-ui/cdk'
 
 @Component({
diff --git a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
index 43c7f82c4..c65de7a29 100644
--- a/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
+++ b/frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.service.ts
@@ -3,7 +3,7 @@ import { endWith, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { Emver } from '@start9labs/shared'
 import { PatchDB } from 'patch-db-client'
-import { ConfigService } from '../../../services/config.service'
+import { ConfigService } from 'src/app/services/config.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 
 @Injectable({ providedIn: 'root' })
diff --git a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts b/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
index 72b6956ee..676aa0dc6 100644
--- a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
+++ b/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.ts
@@ -4,7 +4,7 @@ import { ErrorToastService } from '@start9labs/shared'
 import { Observable, Subject, merge } from 'rxjs'
 
 import { UpdateToastService } from './update-toast.service'
-import { ApiService } from '../../../services/api/embassy-api.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 
 @Component({
   selector: 'update-toast',
diff --git a/frontend/projects/ui/src/app/marketplace.module.ts b/frontend/projects/ui/src/app/marketplace.module.ts
deleted file mode 100644
index 0a33eec32..000000000
--- a/frontend/projects/ui/src/app/marketplace.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core'
-import { AbstractMarketplaceService } from '@start9labs/marketplace'
-import { MarketplaceService } from 'src/app/services/marketplace.service'
-
-@NgModule({
-  providers: [
-    {
-      provide: AbstractMarketplaceService,
-      useClass: MarketplaceService,
-    },
-  ],
-})
-export class MarketplaceModule {}
diff --git a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts b/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
index 7e0778d2e..1b3ff1118 100644
--- a/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
+++ b/frontend/projects/ui/src/app/modals/marketplace-settings/marketplace-settings.page.ts
@@ -9,7 +9,7 @@ import { DataModel, UIStore } from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import { map } from 'rxjs/operators'
 import { combineLatest, filter, firstValueFrom, Subscription } from 'rxjs'
-import { FormDialogService } from '../../services/form-dialog.service'
+import { FormDialogService } from 'src/app/services/form-dialog.service'
 import { FormPage } from '../form/form.page'
 import { LoadingService } from '../loading/loading.service'
 import { TUI_PROMPT } from '@taiga-ui/kit'
diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts b/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts
index eb9de93db..b87962876 100644
--- a/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts
+++ b/frontend/projects/ui/src/app/modals/os-update/os-update.page.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
-import { ApiService } from '../../services/api/embassy-api.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ErrorToastService } from '@start9labs/shared'
 import { EOSService } from 'src/app/services/eos.service'
 
diff --git a/frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts b/frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts
index f8d03a81b..cce274115 100644
--- a/frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts
+++ b/frontend/projects/ui/src/app/pipes/ui/ui.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core'
 import { InstalledPackageInfo } from 'src/app/services/patch-db/data-model'
-import { hasUi } from '../../services/config.service'
+import { hasUi } from 'src/app/services/config.service'
 
 @Pipe({
   name: 'hasUi',
diff --git a/frontend/projects/ui/src/app/routing.module.ts b/frontend/projects/ui/src/app/routing.module.ts
new file mode 100644
index 000000000..c6fb75ef1
--- /dev/null
+++ b/frontend/projects/ui/src/app/routing.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core'
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router'
+import { AuthGuard } from './guards/auth.guard'
+import { UnauthGuard } from './guards/unauth.guard'
+
+const routes: Routes = [
+  {
+    path: 'loading',
+    canActivate: [UnauthGuard],
+    loadChildren: () =>
+      import('./apps/loading/loading.module').then(m => m.LoadingPageModule),
+  },
+  {
+    path: 'login',
+    canActivate: [UnauthGuard],
+    loadChildren: () =>
+      import('./apps/login/login.module').then(m => m.LoginPageModule),
+  },
+  {
+    path: '',
+    canActivate: [AuthGuard],
+    canActivateChild: [AuthGuard],
+    loadChildren: () => import('./apps/ui/ui.module').then(m => m.UiModule),
+  },
+]
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, {
+      scrollPositionRestoration: 'enabled',
+      preloadingStrategy: PreloadAllModules,
+      initialNavigation: 'disabled',
+    }),
+  ],
+  exports: [RouterModule],
+})
+export class RoutingModule {}
diff --git a/frontend/projects/ui/src/app/services/api/embassy-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
index 474de4095..2b149e919 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-api.service.ts
@@ -295,4 +295,6 @@ export abstract class ApiService {
   ): Promise<RR.SideloadPacakgeRes>
 
   abstract getSetupStatus(): Promise<SetupStatus | null>
+
+  abstract followLogs(): Promise<string>
 }
diff --git a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 0ab330818..32e74e779 100644
--- a/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/frontend/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -1003,6 +1003,11 @@ export class MockApiService extends ApiService {
     return getSetupStatusMock()
   }
 
+  async followLogs(): Promise<string> {
+    await pauseFor(1000)
+    return 'fake-guid'
+  }
+
   private async updateProgress(id: string): Promise<void> {
     const progress = { ...PROGRESS }
     const phases = [
diff --git a/frontend/projects/ui/src/app/services/api/mock-patch.ts b/frontend/projects/ui/src/app/services/api/mock-patch.ts
index b24fc8753..4f678ecb5 100644
--- a/frontend/projects/ui/src/app/services/api/mock-patch.ts
+++ b/frontend/projects/ui/src/app/services/api/mock-patch.ts
@@ -1,5 +1,5 @@
 import { DataModel } from 'src/app/services/patch-db/data-model'
-import { BUILT_IN_WIDGETS } from '../../pages/widgets/built-in/widgets'
+import { BUILT_IN_WIDGETS } from 'src/app/apps/ui/pages/widgets/built-in/widgets'
 import { Mock } from './api.fixures'
 
 export const mockPatchData: DataModel = {
diff --git a/frontend/projects/ui/src/app/services/auth.service.ts b/frontend/projects/ui/src/app/services/auth.service.ts
index 5d755aa98..2dec137e6 100644
--- a/frontend/projects/ui/src/app/services/auth.service.ts
+++ b/frontend/projects/ui/src/app/services/auth.service.ts
@@ -27,11 +27,10 @@ export class AuthService {
   ) {}
 
   init(): void {
-    const loggedIn = this.storage.get(this.LOGGED_IN_KEY)
-    if (loggedIn) {
+    if (this.storage.get(this.LOGGED_IN_KEY)) {
       this.setVerified()
     } else {
-      this.setUnverified()
+      this.setUnverified(true)
     }
   }
 
@@ -40,11 +39,14 @@ export class AuthService {
     this.authState$.next(AuthState.VERIFIED)
   }
 
-  setUnverified(): void {
+  setUnverified(skipNavigation = false): void {
     this.authState$.next(AuthState.UNVERIFIED)
     this.storage.clear()
-    this.zone.run(() => {
-      this.router.navigate(['/login'], { replaceUrl: true })
-    })
+
+    if (!skipNavigation) {
+      this.zone.run(() => {
+        this.router.navigate(['/login'], { replaceUrl: true })
+      })
+    }
   }
 }
diff --git a/frontend/projects/ui/src/app/services/patch-data.service.ts b/frontend/projects/ui/src/app/services/patch-data.service.ts
index 23ee15925..248dca045 100644
--- a/frontend/projects/ui/src/app/services/patch-data.service.ts
+++ b/frontend/projects/ui/src/app/services/patch-data.service.ts
@@ -3,7 +3,7 @@ import { ModalController } from '@ionic/angular'
 import { Observable } from 'rxjs'
 import { filter, share, switchMap, take, tap } from 'rxjs/operators'
 import { PatchDB } from 'patch-db-client'
-import { DataModel, UIData } from 'src/app/services/patch-db/data-model'
+import { DataModel } from 'src/app/services/patch-db/data-model'
 import { EOSService } from 'src/app/services/eos.service'
 import { OSWelcomePage } from 'src/app/modals/os-welcome/os-welcome.page'
 import { ConfigService } from 'src/app/services/config.service'