refactor: Add occuranceCount field to ExceptionsTable and ExceptionExplorer components

Add debug logging to StatusPageDomainService.ts for debugging failing…

.github/workflows/compile.yml

@@ -20,10 +20,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
       - run: cd Accounts && npm install && npm run compile && npm run dep-check
 
   compile-isolated-vm:
@@ -36,51 +32,8 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd CommonServer && npm install
       - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check
 
-  compile-common-server:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install && npm run compile && npm run dep-check
-
-  compile-common-project:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonProject && npm install && npm run compile && npm run dep-check
-
-  compile-common-ui:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonUI && npm install --force && npm run compile && npm run dep-check
-
   compile-common:
     runs-on: ubuntu-latest
     env:
@@ -90,9 +43,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install && npm run compile && npm run dep-check
+      - run: cd Common && npm install && npm run compile && npm run dep-check
 
   compile-app:
     runs-on: ubuntu-latest
@@ -104,10 +55,7 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
+      
       - run: cd App && npm install && npm run compile && npm run dep-check
 
   compile-copilot:
@@ -120,9 +68,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
       - run: cd Copilot && npm install && npm run compile && npm run dep-check
 
   compile-nginx:
@@ -135,10 +80,7 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
+      
       - run: cd Nginx && npm install && npm run compile && npm run dep-check
 
   compile-infrastructure-agent:
@@ -162,10 +104,7 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
+      
       - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check
 
   compile-dashboard:
@@ -178,27 +117,10 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
+      
       - run: cd Dashboard && npm install && npm run compile && npm run dep-check
 
 
-  compile-model:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd Model && npm install && npm run compile && npm run dep-check
-
   compile-e2e:
     runs-on: ubuntu-latest
     env:
@@ -209,7 +131,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
       - run: cd E2E && npm install && npm run compile && npm run dep-check
 
   compile-probe:
@@ -222,9 +143,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
       - run: cd Probe && npm install && npm run compile && npm run dep-check
 
   compile-ingestor:
@@ -237,9 +155,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
       - run: cd Ingestor && npm install && npm run compile && npm run dep-check
   
 
@@ -253,10 +168,7 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonUI && npm install --force
+      
       - run: cd StatusPage && npm install && npm run compile && npm run dep-check
 
   compile-test-server:
@@ -269,7 +181,4 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonProject && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
       - run: cd TestServer && npm install && npm run compile && npm run dep-check

.github/workflows/release.yml

@@ -1133,7 +1133,7 @@ jobs:
   test-e2e-release-self-hosted: 
     runs-on: ubuntu-latest
     # After all the jobs runs
-    needs: [copilot-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
+    needs: [copilot-docker-image-deploy, llm-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, haraka-docker-image-deploy, ingestor-docker-image-deploy, isolated-vm-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

.github/workflows/reliability-copilot.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       
-    # Run Reliability Copilot in Doker Container
+    # Run Reliability Copilot in Docker Container
     - name: Run Copilot
       run: |
         docker run --rm \

.github/workflows/test.common-server.yaml

@@ -1,24 +0,0 @@
-name: Common Server Test
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd CommonServer && bash test-setup.sh
-      - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && rm -rf build && npm run test

.github/workflows/test.common.yaml

@@ -12,11 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
+      BILLING_PRIVATE_KEY: ${{secrets.TEST_BILLING_PRIVATE_KEY}}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18.3.0
-      - run: cd Model && npm install 
-      - run: cd Common && npm install && npm run test
+          node-version: 18.3.0 
+      - run: cd Common && bash test-setup.sh
+      - run: cd Common && npm install && rm -rf build && npm run test
   

.github/workflows/test.commonui.yaml

@@ -1,23 +0,0 @@
-name: CommonUI Test
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonUI && npm install --force && npm run test
-  

.github/workflows/test.model.yaml

@@ -1,23 +0,0 @@
-name: Model Test
-
-on:
-  pull_request: 
-  push:
-    branches-ignore:
-      - 'hotfix-*'   # excludes hotfix branches
-      - 'release'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd Model && npm install && npm run test
-  

.github/workflows/test.probe.yaml

@@ -18,7 +18,6 @@ jobs:
         with:
           node-version: 18.3.0
       - run: cd Common && npm install
-      - run: cd CommonServer && npm install
       - run: cd Probe && npm install
       - run: cd Probe && npm run test
   

.prettierignore

@@ -51,6 +51,3 @@ licenses/*
 certifications/*
 ApiReference/public/assets/*
 JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/*
-
-
-CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts

.vscode/launch.json

@@ -218,12 +218,12 @@
             "autoAttachChildProcesses": true
         },
         {
-            "name": "CommonServer: Debug Tests",
+            "name": "Common: Debug Tests",
             "type": "node",
             "restart": true,
             "autoAttachChildProcesses": true,
             "request": "launch",
-            "cwd": "${workspaceRoot}/CommonServer",
+            "cwd": "${workspaceRoot}/Common",
             "runtimeExecutable": "npm",
             "runtimeArgs": [
                 "run-script",

Accounts/Dockerfile.tpl

@@ -36,40 +36,17 @@ COPY ./Common /usr/src/Common
 
 
 
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-# Set version in ./Model/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
-RUN npm install
-COPY ./Model /usr/src/Model
-
-WORKDIR /usr/src/CommonProject
-COPY ./CommonProject/package*.json /usr/src/CommonProject/
-# Set version in ./CommonProject/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
-RUN npm install
-COPY ./CommonProject /usr/src/CommonProject
-
-
-
-WORKDIR /usr/src/CommonServer
-COPY ./CommonServer/package*.json /usr/src/CommonServer/
-# Set version in ./CommonServer/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
-RUN npm install
-COPY ./CommonServer /usr/src/CommonServer
 
 
 
 
-# Install CommonUI
 
-WORKDIR /usr/src/CommonUI
-COPY ./CommonUI/package*.json /usr/src/CommonUI/
-# Set version in ./CommonUI/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
-RUN npm install --force
-COPY ./CommonUI /usr/src/CommonUI
+
+
+
+
+
+
 
 
 

Accounts/Serve.ts

@@ -1,7 +1,7 @@
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import Express, { ExpressApplication } from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import App from "CommonServer/Utils/StartServer";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import App from "Common/Server/Utils/StartServer";
 
 export const APP_NAME: string = "accounts";
 

Accounts/package-lock.json

@@ -9,13 +9,11 @@
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
-                "CommonUI": "file:../CommonUI",
+            
                 "css-loader": "^6.11.0",
                 "dotenv": "^16.4.5",
                 "express": "^4.19.2",
                 "file-loader": "^6.2.0",
-                "Model": "file:../Model",
                 "react": "^18.3.1",
                 "react-dom": "^18.3.1",
                 "react-router-dom": "^6.23.1",
@@ -39,25 +37,81 @@
             "version": "1.0.0",
             "license": "Apache-2.0",
             "dependencies": {
+                "@babel/runtime": "^7.24.6",
+                "@monaco-editor/react": "^4.4.6",
+                "@nivo/core": "^0.87.0",
+                "@nivo/line": "^0.87.0",
+                "@opentelemetry/api": "^1.9.0",
+                "@opentelemetry/context-zone": "^1.25.0",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.52.0",
+                "@opentelemetry/instrumentation": "^0.52.0",
+                "@opentelemetry/instrumentation-fetch": "^0.52.1",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
+                "@opentelemetry/resources": "^1.25.0",
+                "@opentelemetry/sdk-trace-web": "^1.23.0",
+                "@opentelemetry/semantic-conventions": "^1.25.0",
+                "@tippyjs/react": "^4.2.6",
                 "@types/crypto-js": "^4.2.2",
+                "@types/qrcode": "^1.5.5",
+                "@types/react-highlight": "^0.12.8",
+                "@types/react-syntax-highlighter": "^15.5.13",
                 "@types/uuid": "^8.3.4",
                 "axios": "^1.7.2",
+                "Common": "file:../Common",
                 "crypto-js": "^4.1.1",
+                "formik": "^2.4.6",
+                "history": "^5.3.0",
                 "json5": "^2.2.3",
+                "jwt-decode": "^4.0.0",
+                "lodash": "^4.17.21",
                 "moment": "^2.30.1",
                 "moment-timezone": "^0.5.45",
                 "posthog-js": "^1.139.6",
+                "prop-types": "^15.8.1",
+                "qrcode": "^1.5.3",
+                "react": "^18.3.1",
+                "react-beautiful-dnd": "^13.1.1",
+                "react-big-calendar": "^1.13.0",
+                "react-color": "^2.19.3",
+                "react-dom": "^18.3.1",
+                "react-dropzone": "^14.2.2",
+                "react-error-boundary": "^4.0.13",
+                "react-highlight": "^0.15.0",
+                "react-markdown": "^8.0.3",
+                "react-router-dom": "^6.24.1",
+                "react-select": "^5.4.0",
+                "react-spinners": "^0.14.1",
+                "react-syntax-highlighter": "^15.5.0",
+                "react-toggle": "^4.1.3",
+                "reactflow": "^11.11.4",
                 "reflect-metadata": "^0.2.2",
+                "remark-gfm": "^3.0.1",
                 "slugify": "^1.6.5",
+                "socket.io-client": "^4.7.5",
+                "tippy.js": "^6.3.7",
                 "typeorm": "^0.3.20",
+                "universal-cookie": "^4.0.4",
+                "use-async-effect": "^2.2.6",
                 "uuid": "^8.3.2"
             },
             "devDependencies": {
                 "@faker-js/faker": "^8.0.2",
-                "@types/jest": "^27.5.2",
-                "@types/node": "^17.0.22",
-                "jest": "^27.5.1",
-                "ts-jest": "^27.1.4"
+                "@testing-library/jest-dom": "^5.16.5",
+                "@testing-library/react": "^13.3.0",
+                "@testing-library/user-event": "^14.4.3",
+                "@types/jest": "^28.1.4",
+                "@types/lodash": "^4.14.202",
+                "@types/node": "^17.0.45",
+                "@types/react": "^18.2.38",
+                "@types/react-beautiful-dnd": "^13.1.2",
+                "@types/react-big-calendar": "^1.8.5",
+                "@types/react-color": "^3.0.6",
+                "@types/react-test-renderer": "^18.0.0",
+                "@types/react-toggle": "^4.0.3",
+                "jest": "^28.1.1",
+                "jest-environment-jsdom": "^29.7.0",
+                "react-test-renderer": "^18.2.0",
+                "ts-jest": "^28.0.5"
             }
         },
         "../CommonServer": {
@@ -83,7 +137,6 @@
                 "airtable": "^0.12.2",
                 "bullmq": "^5.3.3",
                 "Common": "file:../Common",
-                "CommonProject": "file:../CommonProject",
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
@@ -95,9 +148,9 @@
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
                 "marked": "^12.0.2",
-                "Model": "file:../Model",
                 "node-cron": "^3.0.3",
                 "nodemailer": "^6.9.10",
+                "otpauth": "^9.3.1",
                 "pg": "^8.7.3",
                 "redis-semaphore": "^5.5.1",
                 "socket.io": "^4.7.4",
@@ -126,6 +179,7 @@
         "../CommonUI": {
             "name": "@oneuptime/common-ui",
             "version": "1.0.0",
+            "extraneous": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@babel/runtime": "^7.24.6",
@@ -197,6 +251,7 @@
         "../Model": {
             "name": "@oneuptime/model",
             "version": "1.0.0",
+            "extraneous": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "Common": "file:../Common",
@@ -905,10 +960,6 @@
             "resolved": "../CommonServer",
             "link": true
         },
-        "node_modules/CommonUI": {
-            "resolved": "../CommonUI",
-            "link": true
-        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1749,10 +1800,6 @@
                 "node": "*"
             }
         },
-        "node_modules/Model": {
-            "resolved": "../Model",
-            "link": true
-        },
         "node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

Accounts/package.json

@@ -27,14 +27,10 @@
     },
     "dependencies": {
         "Common": "file:../Common",
-    
-        "CommonServer": "file:../CommonServer",
-        "CommonUI": "file:../CommonUI",
         "css-loader": "^6.11.0",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
         "file-loader": "^6.2.0",
-        "Model": "file:../Model",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",

Accounts/src/App.tsx

@@ -5,7 +5,7 @@ import NotFound from "./Pages/NotFound";
 import RegisterPage from "./Pages/Register";
 import ResetPasswordPage from "./Pages/ResetPassword";
 import VerifyEmail from "./Pages/VerifyEmail";
-import Navigation from "CommonUI/src/Utils/Navigation";
+import Navigation from "Common/UI/Utils/Navigation";
 import React, { ReactElement } from "react";
 import {
   Route,

Accounts/src/Index.tsx

@@ -1,5 +1,5 @@
 import App from "./App";
-import Telemetry from "CommonUI/src/Utils/Telemetry";
+import Telemetry from "Common/UI/Utils/Telemetry";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";

Accounts/src/Pages/ForgotPassword.tsx

@@ -1,11 +1,11 @@
 import { FORGOT_PASSWORD_API_URL } from "../Utils/ApiPaths";
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
-import ModelForm, { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import Link from "CommonUI/src/Components/Link/Link";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import User from "Model/Models/User";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import Link from "Common/UI/Components/Link/Link";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 
 const ForgotPassword: () => JSX.Element = () => {

Accounts/src/Pages/Login.tsx

@@ -5,22 +5,22 @@ import {
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
-import ModelForm, { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import Link from "CommonUI/src/Components/Link/Link";
-import { DASHBOARD_URL } from "CommonUI/src/Config";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import UiAnalytics from "CommonUI/src/Utils/Analytics";
-import LoginUtil from "CommonUI/src/Utils/Login";
-import UserTwoFactorAuth from "Model/Models/UserTwoFactorAuth";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import UserUtil from "CommonUI/src/Utils/User";
-import User from "Model/Models/User";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import Link from "Common/UI/Components/Link/Link";
+import { DASHBOARD_URL } from "Common/UI/Config";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import UiAnalytics from "Common/UI/Utils/Analytics";
+import LoginUtil from "Common/UI/Utils/Login";
+import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
+import Navigation from "Common/UI/Utils/Navigation";
+import UserUtil from "Common/UI/Utils/User";
+import User from "Common/Models/DatabaseModels/User";
 import React from "react";
 import useAsyncEffect from "use-async-effect";
-import StaticModelList from "CommonUI/src/Components/ModelList/StaticModelList";
-import BasicForm from "CommonUI/src/Components/Forms/BasicForm";
-import API from "CommonUI/src/Utils/API/API";
+import StaticModelList from "Common/UI/Components/ModelList/StaticModelList";
+import BasicForm from "Common/UI/Components/Forms/BasicForm";
+import API from "Common/UI/Utils/API/API";
 import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
 import HTTPResponse from "Common/Types/API/HTTPResponse";
 
@@ -227,9 +227,11 @@ const LoginPage: () => JSX.Element = () => {
 
                   const result: HTTPErrorResponse | HTTPResponse<JSONObject> =
                     await API.post(VERIFY_TWO_FACTOR_AUTH_API_URL, {
-                      data: initialValues,
-                      code: code,
-                      twoFactorAuthId: twoFactorAuthId,
+                      data: {
+                        ...initialValues,
+                        code: code,
+                        twoFactorAuthId: twoFactorAuthId,
+                      },
                     });
 
                   if (result instanceof HTTPErrorResponse) {

Accounts/src/Pages/LoginWithSSO.tsx

@@ -2,22 +2,22 @@ import { SERVICE_PROVIDER_LOGIN_URL } from "../Utils/ApiPaths";
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import Link from "CommonUI/src/Components/Link/Link";
-import { DASHBOARD_URL, IDENTITY_URL } from "CommonUI/src/Config";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import UserUtil from "CommonUI/src/Utils/User";
-import User from "Model/Models/User";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import Link from "Common/UI/Components/Link/Link";
+import { DASHBOARD_URL, IDENTITY_URL } from "Common/UI/Config";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import Navigation from "Common/UI/Utils/Navigation";
+import UserUtil from "Common/UI/Utils/User";
+import User from "Common/Models/DatabaseModels/User";
 import React, { ReactElement, useState } from "react";
-import ProjectSSO from "Model/Models/ProjectSso";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import API from "CommonUI/src/Utils/API/API";
-import BasicForm from "CommonUI/src/Components/Forms/BasicForm";
+import ProjectSSO from "Common/Models/DatabaseModels/ProjectSso";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import API from "Common/UI/Utils/API/API";
+import BasicForm from "Common/UI/Components/Forms/BasicForm";
 import Email from "Common/Types/Email";
 import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
 import HTTPResponse from "Common/Types/API/HTTPResponse";
-import StaticModelList from "CommonUI/src/Components/ModelList/StaticModelList";
+import StaticModelList from "Common/UI/Components/ModelList/StaticModelList";
 
 const LoginPage: () => JSX.Element = () => {
   const apiUrl: URL = SERVICE_PROVIDER_LOGIN_URL;

Accounts/src/Pages/Register.tsx

@@ -3,23 +3,23 @@ import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
 import Dictionary from "Common/Types/Dictionary";
 import { JSONObject } from "Common/Types/JSON";
-import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
-import ModelForm, { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import Fields from "CommonUI/src/Components/Forms/Types/Fields";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import Link from "CommonUI/src/Components/Link/Link";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import { BILLING_ENABLED, DASHBOARD_URL } from "CommonUI/src/Config";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import BaseAPI from "CommonUI/src/Utils/API/API";
-import UiAnalytics from "CommonUI/src/Utils/Analytics";
-import LocalStorage from "CommonUI/src/Utils/LocalStorage";
-import LoginUtil from "CommonUI/src/Utils/Login";
-import ModelAPI, { ListResult } from "CommonUI/src/Utils/ModelAPI/ModelAPI";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import UserUtil from "CommonUI/src/Utils/User";
-import Reseller from "Model/Models/Reseller";
-import User from "Model/Models/User";
+import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
+import Fields from "Common/UI/Components/Forms/Types/Fields";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import Link from "Common/UI/Components/Link/Link";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import { BILLING_ENABLED, DASHBOARD_URL } from "Common/UI/Config";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import BaseAPI from "Common/UI/Utils/API/API";
+import UiAnalytics from "Common/UI/Utils/Analytics";
+import LocalStorage from "Common/UI/Utils/LocalStorage";
+import LoginUtil from "Common/UI/Utils/Login";
+import ModelAPI, { ListResult } from "Common/UI/Utils/ModelAPI/ModelAPI";
+import Navigation from "Common/UI/Utils/Navigation";
+import UserUtil from "Common/UI/Utils/User";
+import Reseller from "Common/Models/DatabaseModels/Reseller";
+import User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 import useAsyncEffect from "use-async-effect";
 

Accounts/src/Pages/ResetPassword.tsx

@@ -1,12 +1,12 @@
 import { RESET_PASSWORD_API_URL } from "../Utils/ApiPaths";
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
-import ModelForm, { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import Link from "CommonUI/src/Components/Link/Link";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import User from "Model/Models/User";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import Link from "Common/UI/Components/Link/Link";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import Navigation from "Common/UI/Utils/Navigation";
+import User from "Common/Models/DatabaseModels/User";
 import React, { useState } from "react";
 
 const RegisterPage: () => JSX.Element = () => {

Accounts/src/Pages/VerifyEmail.tsx

@@ -3,14 +3,14 @@ import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ObjectID from "Common/Types/ObjectID";
-import { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import Link from "CommonUI/src/Components/Link/Link";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
-import API from "CommonUI/src/Utils/API/API";
-import ModelAPI from "CommonUI/src/Utils/ModelAPI/ModelAPI";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import EmailVerificationToken from "Model/Models/EmailVerificationToken";
+import { FormType } from "Common/UI/Components/Forms/ModelForm";
+import Link from "Common/UI/Components/Link/Link";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
+import API from "Common/UI/Utils/API/API";
+import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
+import Navigation from "Common/UI/Utils/Navigation";
+import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
 import React, { useEffect, useState } from "react";
 
 const VerifyEmail: () => JSX.Element = () => {

Accounts/src/Utils/ApiPaths.ts

@@ -1,6 +1,6 @@
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
-import { IDENTITY_URL } from "CommonUI/src/Config";
+import { IDENTITY_URL } from "Common/UI/Config";
 
 export const SIGNUP_API_URL: URL = URL.fromURL(IDENTITY_URL).addRoute(
   new Route("/signup"),

AdminDashboard/Dockerfile.tpl

@@ -35,40 +35,17 @@ RUN npm install
 COPY ./Common /usr/src/Common
 
 
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-# Set version in ./Model/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
-RUN npm install
-COPY ./Model /usr/src/Model
-
-WORKDIR /usr/src/CommonProject
-COPY ./CommonProject/package*.json /usr/src/CommonProject/
-# Set version in ./CommonProject/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
-RUN npm install
-COPY ./CommonProject /usr/src/CommonProject
-
-
-
-WORKDIR /usr/src/CommonServer
-COPY ./CommonServer/package*.json /usr/src/CommonServer/
-# Set version in ./CommonServer/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
-RUN npm install
-COPY ./CommonServer /usr/src/CommonServer
 
 
 
 
-# Install CommonUI
 
-WORKDIR /usr/src/CommonUI
-COPY ./CommonUI/package*.json /usr/src/CommonUI/
-# Set version in ./CommonUI/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonUI/package.json
-RUN npm install --force
-COPY ./CommonUI /usr/src/CommonUI
+
+
+
+
+
+
 
 
 

AdminDashboard/Serve.ts

@@ -1,7 +1,7 @@
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import Express, { ExpressApplication } from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import App from "CommonServer/Utils/StartServer";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import App from "Common/Server/Utils/StartServer";
 
 export const APP_NAME: string = "admin";
 

AdminDashboard/package-lock.json

@@ -9,11 +9,9 @@
             "version": "0.1.0",
             "dependencies": {
                 "Common": "file:../Common",
-                "CommonServer": "file:../CommonServer",
-                "CommonUI": "file:../CommonUI",
+            
                 "dotenv": "^16.4.5",
                 "file-loader": "^6.2.0",
-                "Model": "file:../Model",
                 "react": "^18.3.1",
                 "react-dom": "^18.3.1",
                 "react-router-dom": "^6.23.1",
@@ -39,25 +37,81 @@
             "version": "1.0.0",
             "license": "Apache-2.0",
             "dependencies": {
+                "@babel/runtime": "^7.24.6",
+                "@monaco-editor/react": "^4.4.6",
+                "@nivo/core": "^0.87.0",
+                "@nivo/line": "^0.87.0",
+                "@opentelemetry/api": "^1.9.0",
+                "@opentelemetry/context-zone": "^1.25.0",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.52.0",
+                "@opentelemetry/instrumentation": "^0.52.0",
+                "@opentelemetry/instrumentation-fetch": "^0.52.1",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
+                "@opentelemetry/resources": "^1.25.0",
+                "@opentelemetry/sdk-trace-web": "^1.23.0",
+                "@opentelemetry/semantic-conventions": "^1.25.0",
+                "@tippyjs/react": "^4.2.6",
                 "@types/crypto-js": "^4.2.2",
+                "@types/qrcode": "^1.5.5",
+                "@types/react-highlight": "^0.12.8",
+                "@types/react-syntax-highlighter": "^15.5.13",
                 "@types/uuid": "^8.3.4",
                 "axios": "^1.7.2",
+                "Common": "file:../Common",
                 "crypto-js": "^4.1.1",
+                "formik": "^2.4.6",
+                "history": "^5.3.0",
                 "json5": "^2.2.3",
+                "jwt-decode": "^4.0.0",
+                "lodash": "^4.17.21",
                 "moment": "^2.30.1",
                 "moment-timezone": "^0.5.45",
                 "posthog-js": "^1.139.6",
+                "prop-types": "^15.8.1",
+                "qrcode": "^1.5.3",
+                "react": "^18.3.1",
+                "react-beautiful-dnd": "^13.1.1",
+                "react-big-calendar": "^1.13.0",
+                "react-color": "^2.19.3",
+                "react-dom": "^18.3.1",
+                "react-dropzone": "^14.2.2",
+                "react-error-boundary": "^4.0.13",
+                "react-highlight": "^0.15.0",
+                "react-markdown": "^8.0.3",
+                "react-router-dom": "^6.24.1",
+                "react-select": "^5.4.0",
+                "react-spinners": "^0.14.1",
+                "react-syntax-highlighter": "^15.5.0",
+                "react-toggle": "^4.1.3",
+                "reactflow": "^11.11.4",
                 "reflect-metadata": "^0.2.2",
+                "remark-gfm": "^3.0.1",
                 "slugify": "^1.6.5",
+                "socket.io-client": "^4.7.5",
+                "tippy.js": "^6.3.7",
                 "typeorm": "^0.3.20",
+                "universal-cookie": "^4.0.4",
+                "use-async-effect": "^2.2.6",
                 "uuid": "^8.3.2"
             },
             "devDependencies": {
                 "@faker-js/faker": "^8.0.2",
-                "@types/jest": "^27.5.2",
-                "@types/node": "^17.0.22",
-                "jest": "^27.5.1",
-                "ts-jest": "^27.1.4"
+                "@testing-library/jest-dom": "^5.16.5",
+                "@testing-library/react": "^13.3.0",
+                "@testing-library/user-event": "^14.4.3",
+                "@types/jest": "^28.1.4",
+                "@types/lodash": "^4.14.202",
+                "@types/node": "^17.0.45",
+                "@types/react": "^18.2.38",
+                "@types/react-beautiful-dnd": "^13.1.2",
+                "@types/react-big-calendar": "^1.8.5",
+                "@types/react-color": "^3.0.6",
+                "@types/react-test-renderer": "^18.0.0",
+                "@types/react-toggle": "^4.0.3",
+                "jest": "^28.1.1",
+                "jest-environment-jsdom": "^29.7.0",
+                "react-test-renderer": "^18.2.0",
+                "ts-jest": "^28.0.5"
             }
         },
         "../CommonServer": {
@@ -83,7 +137,6 @@
                 "airtable": "^0.12.2",
                 "bullmq": "^5.3.3",
                 "Common": "file:../Common",
-                "CommonProject": "file:../CommonProject",
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "cron-parser": "^4.8.1",
@@ -95,9 +148,9 @@
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
                 "marked": "^12.0.2",
-                "Model": "file:../Model",
                 "node-cron": "^3.0.3",
                 "nodemailer": "^6.9.10",
+                "otpauth": "^9.3.1",
                 "pg": "^8.7.3",
                 "redis-semaphore": "^5.5.1",
                 "socket.io": "^4.7.4",
@@ -126,6 +179,7 @@
         "../CommonUI": {
             "name": "@oneuptime/common-ui",
             "version": "1.0.0",
+            "extraneous": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@babel/runtime": "^7.24.6",
@@ -197,6 +251,7 @@
         "../Model": {
             "name": "@oneuptime/model",
             "version": "1.0.0",
+            "extraneous": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "Common": "file:../Common",
@@ -6881,10 +6936,6 @@
             "resolved": "../CommonServer",
             "link": true
         },
-        "node_modules/CommonUI": {
-            "resolved": "../CommonUI",
-            "link": true
-        },
         "node_modules/compressible": {
             "version": "2.0.18",
             "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -14257,10 +14308,6 @@
                 "mkdirp": "bin/cmd.js"
             }
         },
-        "node_modules/Model": {
-            "resolved": "../Model",
-            "link": true
-        },
         "node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

AdminDashboard/package.json

@@ -5,11 +5,8 @@
     "dependencies": {
         "Common": "file:../Common",
     
-        "CommonServer": "file:../CommonServer",
-        "CommonUI": "file:../CommonUI",
         "dotenv": "^16.4.5",
         "file-loader": "^6.2.0",
-        "Model": "file:../Model",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-router-dom": "^6.23.1",

AdminDashboard/src/App.tsx

@@ -12,9 +12,9 @@ import Users from "./Pages/Users/Index";
 import PageMap from "./Utils/PageMap";
 import RouteMap from "./Utils/RouteMap";
 import URL from "Common/Types/API/URL";
-import { ACCOUNTS_URL, DASHBOARD_URL } from "CommonUI/src/Config";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import User from "CommonUI/src/Utils/User";
+import { ACCOUNTS_URL, DASHBOARD_URL } from "Common/UI/Config";
+import Navigation from "Common/UI/Utils/Navigation";
+import User from "Common/UI/Utils/User";
 import React from "react";
 import {
   Route as PageRoute,

AdminDashboard/src/Components/Footer/Footer.tsx

@@ -5,9 +5,9 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import { JSONObject } from "Common/Types/JSON";
 import API from "Common/Utils/API";
-import Footer from "CommonUI/src/Components/Footer/Footer";
-import ConfirmModal from "CommonUI/src/Components/Modal/ConfirmModal";
-import { HOST, HTTP_PROTOCOL } from "CommonUI/src/Config";
+import Footer from "Common/UI/Components/Footer/Footer";
+import ConfirmModal from "Common/UI/Components/Modal/ConfirmModal";
+import { HOST, HTTP_PROTOCOL } from "Common/UI/Config";
 import React from "react";
 
 const DashboardFooter: () => JSX.Element = () => {

AdminDashboard/src/Components/Header/Header.tsx

@@ -1,10 +1,10 @@
 import Help from "./Help";
 import Logo from "./Logo";
 import UserProfile from "./UserProfile";
-import Button, { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
-import Header from "CommonUI/src/Components/Header/Header";
-import { DASHBOARD_URL } from "CommonUI/src/Config";
-import Navigation from "CommonUI/src/Utils/Navigation";
+import Button, { ButtonStyleType } from "Common/UI/Components/Button/Button";
+import Header from "Common/UI/Components/Header/Header";
+import { DASHBOARD_URL } from "Common/UI/Config";
+import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const DashboardHeader: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Components/Header/Help.tsx

@@ -1,9 +1,9 @@
 import URL from "Common/Types/API/URL";
 import IconProp from "Common/Types/Icon/IconProp";
-import HeaderIconDropdownButton from "CommonUI/src/Components/Header/HeaderIconDropdownButton";
-import IconDropdownItem from "CommonUI/src/Components/Header/IconDropdown/IconDropdownItem";
-import IconDropdownMenu from "CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu";
-import IconDropdownRow from "CommonUI/src/Components/Header/IconDropdown/IconDropdownRow";
+import HeaderIconDropdownButton from "Common/UI/Components/Header/HeaderIconDropdownButton";
+import IconDropdownItem from "Common/UI/Components/Header/IconDropdown/IconDropdownItem";
+import IconDropdownMenu from "Common/UI/Components/Header/IconDropdown/IconDropdownMenu";
+import IconDropdownRow from "Common/UI/Components/Header/IconDropdown/IconDropdownRow";
 import React, { ReactElement, useState } from "react";
 
 const Help: () => JSX.Element = (): ReactElement => {

AdminDashboard/src/Components/Header/Logo.tsx

@@ -1,7 +1,7 @@
 // Tailwind
 import Route from "Common/Types/API/Route";
-import Image from "CommonUI/src/Components/Image/Image";
-import OneUptimeLogo from "CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg";
+import Image from "Common/UI/Components/Image/Image";
+import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface ComponentProps {

AdminDashboard/src/Components/Header/Notifications.tsx

@@ -1,7 +1,7 @@
 import IconProp from "Common/Types/Icon/IconProp";
-import HeaderIconDropdownButton from "CommonUI/src/Components/Header/HeaderIconDropdownButton";
-import NotificationItem from "CommonUI/src/Components/Header/Notifications/NotificationItem";
-import Notifications from "CommonUI/src/Components/Header/Notifications/Notifications";
+import HeaderIconDropdownButton from "Common/UI/Components/Header/HeaderIconDropdownButton";
+import NotificationItem from "Common/UI/Components/Header/Notifications/NotificationItem";
+import Notifications from "Common/UI/Components/Header/Notifications/Notifications";
 import React, { ReactElement, useState } from "react";
 
 const DashboardHeader: () => JSX.Element = (): ReactElement => {

AdminDashboard/src/Components/Header/ProjectPicker.tsx

@@ -1,16 +1,16 @@
 import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
 import IconProp from "Common/Types/Icon/IconProp";
-import { FormType } from "CommonUI/src/Components/Forms/ModelForm";
-import Field from "CommonUI/src/Components/Forms/Types/Field";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import ProjectPicker from "CommonUI/src/Components/Header/ProjectPicker/ProjectPicker";
-import ModelFormModal from "CommonUI/src/Components/ModelFormModal/ModelFormModal";
-import { RadioButton } from "CommonUI/src/Components/RadioButtons/GroupRadioButtons";
-import Toggle from "CommonUI/src/Components/Toggle/Toggle";
-import { BILLING_ENABLED, getAllEnvVars } from "CommonUI/src/Config";
-import { GetReactElementFunction } from "CommonUI/src/Types/FunctionTypes";
-import ProjectUtil from "CommonUI/src/Utils/Project";
-import Project from "Model/Models/Project";
+import { FormType } from "Common/UI/Components/Forms/ModelForm";
+import Field from "Common/UI/Components/Forms/Types/Field";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import ProjectPicker from "Common/UI/Components/Header/ProjectPicker/ProjectPicker";
+import ModelFormModal from "Common/UI/Components/ModelFormModal/ModelFormModal";
+import { RadioButton } from "Common/UI/Components/RadioButtons/GroupRadioButtons";
+import Toggle from "Common/UI/Components/Toggle/Toggle";
+import { BILLING_ENABLED, getAllEnvVars } from "Common/UI/Config";
+import { GetReactElementFunction } from "Common/UI/Types/FunctionTypes";
+import ProjectUtil from "Common/UI/Utils/Project";
+import Project from "Common/Models/DatabaseModels/Project";
 import React, {
   FunctionComponent,
   ReactElement,

AdminDashboard/src/Components/Header/SearchBox.tsx

@@ -1,5 +1,5 @@
-import SearchBox from "CommonUI/src/Components/Header/SearchBox";
-import Project from "Model/Models/Project";
+import SearchBox from "Common/UI/Components/Header/SearchBox";
+import Project from "Common/Models/DatabaseModels/Project";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface ComponentProps {

AdminDashboard/src/Components/Header/UserProfile.tsx

@@ -2,13 +2,13 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
-import HeaderIconDropdownButton from "CommonUI/src/Components/Header/HeaderIconDropdownButton";
-import IconDropdownItem from "CommonUI/src/Components/Header/IconDropdown/IconDropdownItem";
-import IconDropdownMenu from "CommonUI/src/Components/Header/IconDropdown/IconDropdownMenu";
-import { DASHBOARD_URL } from "CommonUI/src/Config";
-import BlankProfilePic from "CommonUI/src/Images/users/blank-profile.svg";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import User from "CommonUI/src/Utils/User";
+import HeaderIconDropdownButton from "Common/UI/Components/Header/HeaderIconDropdownButton";
+import IconDropdownItem from "Common/UI/Components/Header/IconDropdown/IconDropdownItem";
+import IconDropdownMenu from "Common/UI/Components/Header/IconDropdown/IconDropdownMenu";
+import { DASHBOARD_URL } from "Common/UI/Config";
+import BlankProfilePic from "Common/UI/Images/users/blank-profile.svg";
+import Navigation from "Common/UI/Utils/Navigation";
+import User from "Common/UI/Utils/User";
 import React, { FunctionComponent, ReactElement, useState } from "react";
 
 const DashboardUserProfile: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Components/MasterPage/MasterPage.tsx

@@ -1,8 +1,8 @@
 import Footer from "../Footer/Footer";
 import Header from "../Header/Header";
 import NavBar from "../NavBar/NavBar";
-import MasterPage from "CommonUI/src/Components/MasterPage/MasterPage";
-import TopAlert from "CommonUI/src/Components/TopAlert/TopAlert";
+import MasterPage from "Common/UI/Components/MasterPage/MasterPage";
+import TopAlert from "Common/UI/Components/TopAlert/TopAlert";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface ComponentProps {

AdminDashboard/src/Components/NavBar/NavBar.tsx

@@ -2,8 +2,8 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
-import NavBar from "CommonUI/src/Components/Navbar/NavBar";
-import NavBarItem from "CommonUI/src/Components/Navbar/NavBarItem";
+import NavBar from "Common/UI/Components/Navbar/NavBar";
+import NavBarItem from "Common/UI/Components/Navbar/NavBarItem";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const DashboardNavbar: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Index.tsx

@@ -1,5 +1,5 @@
 import App from "./App";
-import Telemetry from "CommonUI/src/Utils/Telemetry";
+import Telemetry from "Common/UI/Utils/Telemetry";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";

AdminDashboard/src/Pages/Init/Init.tsx

@@ -1,8 +1,8 @@
 import PageMap from "../../Utils/PageMap";
 import RouteMap from "../../Utils/RouteMap";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import Page from "CommonUI/src/Components/Page/Page";
-import Navigation from "CommonUI/src/Utils/Navigation";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import Page from "Common/UI/Components/Page/Page";
+import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement, useEffect } from "react";
 
 const Init: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Logout/Logout.tsx

@@ -2,13 +2,13 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import Page from "CommonUI/src/Components/Page/Page";
-import { ACCOUNTS_URL } from "CommonUI/src/Config";
-import UiAnalytics from "CommonUI/src/Utils/Analytics";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import UserUtil from "CommonUI/src/Utils/User";
+import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import Page from "Common/UI/Components/Page/Page";
+import { ACCOUNTS_URL } from "Common/UI/Config";
+import UiAnalytics from "Common/UI/Utils/Analytics";
+import Navigation from "Common/UI/Utils/Navigation";
+import UserUtil from "Common/UI/Utils/User";
 import React, { FunctionComponent, ReactElement, useEffect } from "react";
 
 const Logout: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Projects/Index.tsx

@@ -3,18 +3,18 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
-import Field from "CommonUI/src/Components/Forms/Types/Field";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import ModelTable from "CommonUI/src/Components/ModelTable/ModelTable";
-import Page from "CommonUI/src/Components/Page/Page";
-import { RadioButton } from "CommonUI/src/Components/RadioButtons/GroupRadioButtons";
-import Toggle from "CommonUI/src/Components/Toggle/Toggle";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import { BILLING_ENABLED, getAllEnvVars } from "CommonUI/src/Config";
-import { GetReactElementFunction } from "CommonUI/src/Types/FunctionTypes";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import Project from "Model/Models/Project";
-import User from "Model/Models/User";
+import Field from "Common/UI/Components/Forms/Types/Field";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import ModelTable from "Common/UI/Components/ModelTable/ModelTable";
+import Page from "Common/UI/Components/Page/Page";
+import { RadioButton } from "Common/UI/Components/RadioButtons/GroupRadioButtons";
+import Toggle from "Common/UI/Components/Toggle/Toggle";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import { BILLING_ENABLED, getAllEnvVars } from "Common/UI/Config";
+import { GetReactElementFunction } from "Common/UI/Types/FunctionTypes";
+import Navigation from "Common/UI/Utils/Navigation";
+import Project from "Common/Models/DatabaseModels/Project";
+import User from "Common/Models/DatabaseModels/User";
 import React, {
   FunctionComponent,
   ReactElement,

AdminDashboard/src/Pages/Projects/View/Delete.tsx

@@ -2,12 +2,12 @@ import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
-import ModelDelete from "CommonUI/src/Components/ModelDelete/ModelDelete";
-import Navigation from "CommonUI/src/Utils/Navigation";
+import ModelDelete from "Common/UI/Components/ModelDelete/ModelDelete";
+import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
 import SideMenuComponent from "./SideMenu";
-import Project from "Model/Models/Project";
-import ModelPage from "CommonUI/src/Components/Page/ModelPage";
+import Project from "Common/Models/DatabaseModels/Project";
+import ModelPage from "Common/UI/Components/Page/ModelPage";
 
 const DeletePage: FunctionComponent = (): ReactElement => {
   const modelId: ObjectID = Navigation.getLastParamAsObjectID(1);

AdminDashboard/src/Pages/Projects/View/Index.tsx

@@ -2,13 +2,13 @@ import ObjectID from "Common/Types/ObjectID";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import Project from "Model/Models/Project";
+import Navigation from "Common/UI/Utils/Navigation";
+import Project from "Common/Models/DatabaseModels/Project";
 import React, { FunctionComponent, ReactElement } from "react";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import ModelPage from "CommonUI/src/Components/Page/ModelPage";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import ModelPage from "Common/UI/Components/Page/ModelPage";
 import SideMenuComponent from "./SideMenu";
 
 const Projects: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Projects/View/SideMenu.tsx

@@ -3,9 +3,9 @@ import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
 import ObjectID from "Common/Types/ObjectID";
-import SideMenu from "CommonUI/src/Components/SideMenu/SideMenu";
-import SideMenuItem from "CommonUI/src/Components/SideMenu/SideMenuItem";
-import SideMenuSection from "CommonUI/src/Components/SideMenu/SideMenuSection";
+import SideMenu from "Common/UI/Components/SideMenu/SideMenu";
+import SideMenuItem from "Common/UI/Components/SideMenu/SideMenuItem";
+import SideMenuSection from "Common/UI/Components/SideMenu/SideMenuSection";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface SideMenuProps {

AdminDashboard/src/Pages/Settings/APIKey/Index.tsx

@@ -3,11 +3,11 @@ import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import DashboardSideMenu from "../SideMenu";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import Page from "CommonUI/src/Components/Page/Page";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import GlobalConfig from "Model/Models/GlobalConfig";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import Page from "Common/UI/Components/Page/Page";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Settings/Authentication/Index.tsx

@@ -3,11 +3,11 @@ import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import DashboardSideMenu from "../SideMenu";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import Page from "CommonUI/src/Components/Page/Page";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import GlobalConfig from "Model/Models/GlobalConfig";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import Page from "Common/UI/Components/Page/Page";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Settings/CallSMS/Index.tsx

@@ -3,11 +3,11 @@ import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import DashboardSideMenu from "../SideMenu";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import Page from "CommonUI/src/Components/Page/Page";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import GlobalConfig from "Model/Models/GlobalConfig";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import Page from "Common/UI/Components/Page/Page";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Settings/Email/Index.tsx

@@ -5,16 +5,18 @@ import Route from "Common/Types/API/Route";
 import { Green, Red } from "Common/Types/BrandColors";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ObjectID from "Common/Types/ObjectID";
-import ErrorMessage from "CommonUI/src/Components/ErrorMessage/ErrorMessage";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import PageLoader from "CommonUI/src/Components/Loader/PageLoader";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import Page from "CommonUI/src/Components/Page/Page";
-import Pill from "CommonUI/src/Components/Pill/Pill";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import DropdownUtil from "CommonUI/src/Utils/Dropdown";
-import ModelAPI from "CommonUI/src/Utils/ModelAPI/ModelAPI";
-import GlobalConfig, { EmailServerType } from "Model/Models/GlobalConfig";
+import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import PageLoader from "Common/UI/Components/Loader/PageLoader";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import Page from "Common/UI/Components/Page/Page";
+import Pill from "Common/UI/Components/Pill/Pill";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import DropdownUtil from "Common/UI/Utils/Dropdown";
+import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
+import GlobalConfig, {
+  EmailServerType,
+} from "Common/Models/DatabaseModels/GlobalConfig";
 import React, { FunctionComponent, ReactElement, useEffect } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Settings/Probes/Index.tsx

@@ -7,16 +7,16 @@ import IsNull from "Common/Types/BaseDatabase/IsNull";
 import { Green, Red } from "Common/Types/BrandColors";
 import OneUptimeDate from "Common/Types/Date";
 import { ErrorFunction, VoidFunction } from "Common/Types/FunctionTypes";
-import Banner from "CommonUI/src/Components/Banner/Banner";
-import { ButtonStyleType } from "CommonUI/src/Components/Button/Button";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import ConfirmModal from "CommonUI/src/Components/Modal/ConfirmModal";
-import ModelTable from "CommonUI/src/Components/ModelTable/ModelTable";
-import Page from "CommonUI/src/Components/Page/Page";
-import ProbeElement from "CommonUI/src/Components/Probe/Probe";
-import Statusbubble from "CommonUI/src/Components/StatusBubble/StatusBubble";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import Probe from "Model/Models/Probe";
+import Banner from "Common/UI/Components/Banner/Banner";
+import { ButtonStyleType } from "Common/UI/Components/Button/Button";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import ConfirmModal from "Common/UI/Components/Modal/ConfirmModal";
+import ModelTable from "Common/UI/Components/ModelTable/ModelTable";
+import Page from "Common/UI/Components/Page/Page";
+import ProbeElement from "Common/UI/Components/Probe/Probe";
+import Statusbubble from "Common/UI/Components/StatusBubble/StatusBubble";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import Probe from "Common/Models/DatabaseModels/Probe";
 import React, { FunctionComponent, ReactElement, useState } from "react";
 
 const Settings: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Settings/SideMenu.tsx

@@ -2,9 +2,9 @@ import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
-import SideMenu from "CommonUI/src/Components/SideMenu/SideMenu";
-import SideMenuItem from "CommonUI/src/Components/SideMenu/SideMenuItem";
-import SideMenuSection from "CommonUI/src/Components/SideMenu/SideMenuSection";
+import SideMenu from "Common/UI/Components/SideMenu/SideMenu";
+import SideMenuItem from "Common/UI/Components/SideMenu/SideMenuItem";
+import SideMenuSection from "Common/UI/Components/SideMenu/SideMenuSection";
 import React, { ReactElement } from "react";
 
 const DashboardSideMenu: () => JSX.Element = (): ReactElement => {

AdminDashboard/src/Pages/Users/Index.tsx

@@ -1,12 +1,12 @@
 import PageMap from "../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import ModelTable from "CommonUI/src/Components/ModelTable/ModelTable";
-import Page from "CommonUI/src/Components/Page/Page";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import User from "Model/Models/User";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import ModelTable from "Common/UI/Components/ModelTable/ModelTable";
+import Page from "Common/UI/Components/Page/Page";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import Navigation from "Common/UI/Utils/Navigation";
+import User from "Common/Models/DatabaseModels/User";
 import React, { FunctionComponent, ReactElement } from "react";
 
 const Users: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Users/View/Delete.tsx

@@ -2,12 +2,12 @@ import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import ObjectID from "Common/Types/ObjectID";
-import ModelDelete from "CommonUI/src/Components/ModelDelete/ModelDelete";
-import Navigation from "CommonUI/src/Utils/Navigation";
+import ModelDelete from "Common/UI/Components/ModelDelete/ModelDelete";
+import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
 import SideMenuComponent from "./SideMenu";
-import User from "Model/Models/User";
-import ModelPage from "CommonUI/src/Components/Page/ModelPage";
+import User from "Common/Models/DatabaseModels/User";
+import ModelPage from "Common/UI/Components/Page/ModelPage";
 
 const DeletePage: FunctionComponent = (): ReactElement => {
   const modelId: ObjectID = Navigation.getLastParamAsObjectID(1);

AdminDashboard/src/Pages/Users/View/Index.tsx

@@ -2,13 +2,13 @@ import ObjectID from "Common/Types/ObjectID";
 import PageMap from "../../../Utils/PageMap";
 import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
-import Navigation from "CommonUI/src/Utils/Navigation";
-import User from "Model/Models/User";
+import Navigation from "Common/UI/Utils/Navigation";
+import User from "Common/Models/DatabaseModels/User";
 import React, { FunctionComponent, ReactElement } from "react";
-import CardModelDetail from "CommonUI/src/Components/ModelDetail/CardModelDetail";
-import FormFieldSchemaType from "CommonUI/src/Components/Forms/Types/FormFieldSchemaType";
-import FieldType from "CommonUI/src/Components/Types/FieldType";
-import ModelPage from "CommonUI/src/Components/Page/ModelPage";
+import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
+import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
+import FieldType from "Common/UI/Components/Types/FieldType";
+import ModelPage from "Common/UI/Components/Page/ModelPage";
 import SideMenuComponent from "./SideMenu";
 
 const Users: FunctionComponent = (): ReactElement => {

AdminDashboard/src/Pages/Users/View/SideMenu.tsx

@@ -3,9 +3,9 @@ import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
 import Route from "Common/Types/API/Route";
 import IconProp from "Common/Types/Icon/IconProp";
 import ObjectID from "Common/Types/ObjectID";
-import SideMenu from "CommonUI/src/Components/SideMenu/SideMenu";
-import SideMenuItem from "CommonUI/src/Components/SideMenu/SideMenuItem";
-import SideMenuSection from "CommonUI/src/Components/SideMenu/SideMenuSection";
+import SideMenu from "Common/UI/Components/SideMenu/SideMenu";
+import SideMenuItem from "Common/UI/Components/SideMenu/SideMenuItem";
+import SideMenuSection from "Common/UI/Components/SideMenu/SideMenuSection";
 import React, { FunctionComponent, ReactElement } from "react";
 
 export interface SideMenuProps {

AdminDashboard/src/Utils/ModelAPI.ts

@@ -1,5 +1,5 @@
 import Dictionary from "Common/Types/Dictionary";
-import ModelAPI from "CommonUI/src/Utils/ModelAPI/ModelAPI";
+import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 
 export default class AdminModelAPI extends ModelAPI {
   public static override getCommonHeaders(): Dictionary<string> {

App/Dockerfile.tpl

@@ -38,32 +38,6 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Comm
 RUN npm install
 COPY ./Common /usr/src/Common
 
-
-WORKDIR /usr/src/Model
-COPY ./Model/package*.json /usr/src/Model/
-# Set version in ./Model/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Model/package.json
-RUN npm install
-COPY ./Model /usr/src/Model
-
-WORKDIR /usr/src/CommonProject
-COPY ./CommonProject/package*.json /usr/src/CommonProject/
-# Set version in ./CommonProject/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
-RUN npm install
-COPY ./CommonProject /usr/src/CommonProject
-
-
-
-WORKDIR /usr/src/CommonServer
-COPY ./CommonServer/package*.json /usr/src/CommonServer/
-# Set version in ./CommonServer/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json
-RUN npm install
-COPY ./CommonServer /usr/src/CommonServer
-
-
-
 ENV PRODUCTION=true
 
 WORKDIR /usr/src/app

App/FeatureSet/ApiReference/Index.ts

@@ -10,13 +10,13 @@ import StatusServiceHandler from "./Service/Status";
 import { StaticPath } from "./Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "./Utils/Resources";
 import Dictionary from "Common/Types/Dictionary";
-import FeatureSet from "CommonServer/Types/FeatureSet";
+import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, {
   ExpressApplication,
   ExpressRequest,
   ExpressResponse,
   ExpressStatic,
-} from "CommonServer/Utils/Express";
+} from "Common/Server/Utils/Express";
 
 const APIReferenceFeatureSet: FeatureSet = {
   init: async (): Promise<void> => {

App/FeatureSet/ApiReference/Service/Authentication.ts

@@ -1,6 +1,6 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 // Retrieve resources documentation
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

App/FeatureSet/ApiReference/Service/DataType.ts

@@ -1,8 +1,8 @@
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import LocalCache from "CommonServer/Infrastructure/LocalCache";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
-import LocalFile from "CommonServer/Utils/LocalFile";
+import LocalCache from "Common/Server/Infrastructure/LocalCache";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
+import LocalFile from "Common/Server/Utils/LocalFile";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Errors.ts

@@ -1,6 +1,6 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 // Fetch a list of resources used in the application
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

App/FeatureSet/ApiReference/Service/Introduction.ts

@@ -1,6 +1,6 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 // Get all resources and featured resources from ResourceUtil
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

App/FeatureSet/ApiReference/Service/Model.ts

@@ -10,9 +10,9 @@ import Permission, {
   PermissionHelper,
   PermissionProps,
 } from "Common/Types/Permission";
-import LocalCache from "CommonServer/Infrastructure/LocalCache";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
-import LocalFile from "CommonServer/Utils/LocalFile";
+import LocalCache from "Common/Server/Infrastructure/LocalCache";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
+import LocalFile from "Common/Server/Utils/LocalFile";
 
 // Get all resources and resource dictionary
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

App/FeatureSet/ApiReference/Service/PageNotFound.ts

@@ -1,6 +1,6 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get an array of model documentation resources
 

App/FeatureSet/ApiReference/Service/Pagination.ts

@@ -1,8 +1,8 @@
 import { CodeExamplesPath, ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import LocalCache from "CommonServer/Infrastructure/LocalCache";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
-import LocalFile from "CommonServer/Utils/LocalFile";
+import LocalCache from "Common/Server/Infrastructure/LocalCache";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
+import LocalFile from "Common/Server/Utils/LocalFile";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get all resources from ResourceUtil
 

App/FeatureSet/ApiReference/Service/Permissions.ts

@@ -1,7 +1,7 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { PermissionHelper, PermissionProps } from "Common/Types/Permission";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
 

App/FeatureSet/ApiReference/Service/Status.ts

@@ -1,6 +1,6 @@
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
-import { ExpressRequest, ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 
 const resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get resources from ResourceUtil
 

App/FeatureSet/ApiReference/Utils/Resources.ts

@@ -1,8 +1,8 @@
-import BaseModel from "Common/Models/BaseModel";
+import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import ArrayUtil from "Common/Types/ArrayUtil";
 import Dictionary from "Common/Types/Dictionary";
-import { IsBillingEnabled } from "CommonServer/EnvironmentConfig";
-import Models from "Model/Models/Index";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
+import Models from "Common/Models/DatabaseModels/Index";
 
 export interface ModelDocumentation {
   name: string;

App/FeatureSet/BaseAPI/Index.ts

@@ -1,420 +1,430 @@
-import BaseAPI from "CommonServer/API/BaseAPI";
-import BaseAnalyticsAPI from "CommonServer/API/BaseAnalyticsAPI";
-import BillingInvoiceAPI from "CommonServer/API/BillingInvoiceAPI";
-import BillingPaymentMethodAPI from "CommonServer/API/BillingPaymentMethodAPI";
-import CopilotCodeRepositoryAPI from "CommonServer/API/CopilotCodeRepositoryAPI";
-import CopilotActionAPI from "CommonServer/API/CopilotActionAPI";
-import CopilotPullRequestAPI from "CommonServer/API/CopilotPullRequestAPI";
-import FileAPI from "CommonServer/API/FileAPI";
-import GlobalConfigAPI from "CommonServer/API/GlobalConfigAPI";
-import MonitorGroupAPI from "CommonServer/API/MonitorGroupAPI";
-import NotificationAPI from "CommonServer/API/NotificationAPI";
-import TelemetryAPI from "CommonServer/API/TelemetryAPI";
-import Ingestor from "CommonServer/API/ProbeAPI";
-import ProjectAPI from "CommonServer/API/ProjectAPI";
-import ProjectSsoAPI from "CommonServer/API/ProjectSSO";
+import BaseAPI from "Common/Server/API/BaseAPI";
+import BaseAnalyticsAPI from "Common/Server/API/BaseAnalyticsAPI";
+import BillingInvoiceAPI from "Common/Server/API/BillingInvoiceAPI";
+import BillingPaymentMethodAPI from "Common/Server/API/BillingPaymentMethodAPI";
+import CopilotCodeRepositoryAPI from "Common/Server/API/CopilotCodeRepositoryAPI";
+import CopilotActionAPI from "Common/Server/API/CopilotActionAPI";
+import CopilotPullRequestAPI from "Common/Server/API/CopilotPullRequestAPI";
+import FileAPI from "Common/Server/API/FileAPI";
+import GlobalConfigAPI from "Common/Server/API/GlobalConfigAPI";
+import MonitorGroupAPI from "Common/Server/API/MonitorGroupAPI";
+import NotificationAPI from "Common/Server/API/NotificationAPI";
+import TelemetryAPI from "Common/Server/API/TelemetryAPI";
+import Ingestor from "Common/Server/API/ProbeAPI";
+import ProjectAPI from "Common/Server/API/ProjectAPI";
+import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
 // Import API
-import ResellerPlanAPI from "CommonServer/API/ResellerPlanAPI";
-import ShortLinkAPI from "CommonServer/API/ShortLinkAPI";
-import StatusPageAPI from "CommonServer/API/StatusPageAPI";
-import StatusPageDomainAPI from "CommonServer/API/StatusPageDomainAPI";
-import StatusPageSubscriberAPI from "CommonServer/API/StatusPageSubscriberAPI";
-import UserCallAPI from "CommonServer/API/UserCallAPI";
-import UserTwoFactorAuthAPI from "CommonServer/API/UserTwoFactorAuthAPI";
+import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
+import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
+import StatusPageAPI from "Common/Server/API/StatusPageAPI";
+import StatusPageDomainAPI from "Common/Server/API/StatusPageDomainAPI";
+import StatusPageSubscriberAPI from "Common/Server/API/StatusPageSubscriberAPI";
+import UserCallAPI from "Common/Server/API/UserCallAPI";
+import UserTwoFactorAuthAPI from "Common/Server/API/UserTwoFactorAuthAPI";
 // User Notification methods.
-import UserEmailAPI from "CommonServer/API/UserEmailAPI";
-import UserNotificationLogTimelineAPI from "CommonServer/API/UserOnCallLogTimelineAPI";
-import UserSMSAPI from "CommonServer/API/UserSmsAPI";
+import UserEmailAPI from "Common/Server/API/UserEmailAPI";
+import UserNotificationLogTimelineAPI from "Common/Server/API/UserOnCallLogTimelineAPI";
+import UserSMSAPI from "Common/Server/API/UserSmsAPI";
 import ApiKeyPermissionService, {
   Service as ApiKeyPermissionServiceType,
-} from "CommonServer/Services/ApiKeyPermissionService";
+} from "Common/Server/Services/ApiKeyPermissionService";
 import ApiKeyService, {
   Service as ApiKeyServiceType,
-} from "CommonServer/Services/ApiKeyService";
+} from "Common/Server/Services/ApiKeyService";
 import CallLogService, {
   Service as CallLogServiceType,
-} from "CommonServer/Services/CallLogService";
+} from "Common/Server/Services/CallLogService";
 import DomainService, {
   Service as DomainServiceType,
-} from "CommonServer/Services/DomainService";
+} from "Common/Server/Services/DomainService";
 import EmailLogService, {
   Service as EmailLogServiceType,
-} from "CommonServer/Services/EmailLogService";
+} from "Common/Server/Services/EmailLogService";
 import TelemetryIngestionKeyService, {
   Service as TelemetryIngestionKeyServiceType,
-} from "CommonServer/Services/TelemetryIngestionKeyService";
+} from "Common/Server/Services/TelemetryIngestionKeyService";
 import EmailVerificationTokenService, {
   Service as EmailVerificationTokenServiceType,
-} from "CommonServer/Services/EmailVerificationTokenService";
+} from "Common/Server/Services/EmailVerificationTokenService";
 import IncidentCustomFieldService, {
   Service as IncidentCustomFieldServiceType,
-} from "CommonServer/Services/IncidentCustomFieldService";
+} from "Common/Server/Services/IncidentCustomFieldService";
 import IncidentInternalNoteService, {
   Service as IncidentInternalNoteServiceType,
-} from "CommonServer/Services/IncidentInternalNoteService";
+} from "Common/Server/Services/IncidentInternalNoteService";
 import IncidentNoteTemplateService, {
   Service as IncidentNoteTemplateServiceType,
-} from "CommonServer/Services/IncidentNoteTemplateService";
+} from "Common/Server/Services/IncidentNoteTemplateService";
 import IncidentOwnerTeamService, {
   Service as IncidentOwnerTeamServiceType,
-} from "CommonServer/Services/IncidentOwnerTeamService";
+} from "Common/Server/Services/IncidentOwnerTeamService";
 import IncidentOwnerUserService, {
   Service as IncidentOwnerUserServiceType,
-} from "CommonServer/Services/IncidentOwnerUserService";
+} from "Common/Server/Services/IncidentOwnerUserService";
 import IncidentPublicNoteService, {
   Service as IncidentPublicNoteServiceType,
-} from "CommonServer/Services/IncidentPublicNoteService";
+} from "Common/Server/Services/IncidentPublicNoteService";
 import IncidentService, {
   Service as IncidentServiceType,
-} from "CommonServer/Services/IncidentService";
+} from "Common/Server/Services/IncidentService";
 import IncidentSeverityService, {
   Service as IncidentSeverityServiceType,
-} from "CommonServer/Services/IncidentSeverityService";
+} from "Common/Server/Services/IncidentSeverityService";
 import IncidentStateService, {
   Service as IncidentStateServiceType,
-} from "CommonServer/Services/IncidentStateService";
+} from "Common/Server/Services/IncidentStateService";
 import IncidentStateTimelineService, {
   Service as IncidentStateTimelineServiceType,
-} from "CommonServer/Services/IncidentStateTimelineService";
+} from "Common/Server/Services/IncidentStateTimelineService";
 import IncidentTemplateOwnerTeamService, {
   Service as IncidentTemplateOwnerTeamServiceType,
-} from "CommonServer/Services/IncidentTemplateOwnerTeamService";
+} from "Common/Server/Services/IncidentTemplateOwnerTeamService";
 import IncidentTemplateOwnerUserService, {
   Service as IncidentTemplateOwnerUserServiceType,
-} from "CommonServer/Services/IncidentTemplateOwnerUserService";
+} from "Common/Server/Services/IncidentTemplateOwnerUserService";
 import IncidentTemplateService, {
   Service as IncidentTemplateServiceType,
-} from "CommonServer/Services/IncidentTemplateService";
+} from "Common/Server/Services/IncidentTemplateService";
 import LabelService, {
   Service as LabelServiceType,
-} from "CommonServer/Services/LabelService";
+} from "Common/Server/Services/LabelService";
 import LogService, {
   LogService as LogServiceType,
-} from "CommonServer/Services/LogService";
+} from "Common/Server/Services/LogService";
 
 import TelemetryAttributeService, {
   TelemetryAttributeService as TelemetryAttributeServiceType,
-} from "CommonServer/Services/TelemetryAttributeService";
+} from "Common/Server/Services/TelemetryAttributeService";
 
 import MetricService, {
   MetricService as MetricServiceType,
-} from "CommonServer/Services/MetricService";
+} from "Common/Server/Services/MetricService";
 import MonitorCustomFieldService, {
   Service as MonitorCustomFieldServiceType,
-} from "CommonServer/Services/MonitorCustomFieldService";
+} from "Common/Server/Services/MonitorCustomFieldService";
 import MonitorGroupOwnerTeamService, {
   Service as MonitorGroupOwnerTeamServiceType,
-} from "CommonServer/Services/MonitorGroupOwnerTeamService";
+} from "Common/Server/Services/MonitorGroupOwnerTeamService";
 import MonitorGroupOwnerUserService, {
   Service as MonitorGroupOwnerUserServiceType,
-} from "CommonServer/Services/MonitorGroupOwnerUserService";
+} from "Common/Server/Services/MonitorGroupOwnerUserService";
 import MonitorGroupResourceService, {
   Service as MonitorGroupResourceServiceType,
-} from "CommonServer/Services/MonitorGroupResourceService";
+} from "Common/Server/Services/MonitorGroupResourceService";
 import MonitorMetricsByMinuteService, {
   MonitorMetricsByMinuteService as MonitorMetricsByMinuteServiceType,
-} from "CommonServer/Services/MonitorMetricsByMinuteService";
+} from "Common/Server/Services/MonitorMetricsByMinuteService";
 import MonitorOwnerTeamService, {
   Service as MonitorOwnerTeamServiceType,
-} from "CommonServer/Services/MonitorOwnerTeamService";
+} from "Common/Server/Services/MonitorOwnerTeamService";
 import MonitorOwnerUserService, {
   Service as MonitorOwnerUserServiceType,
-} from "CommonServer/Services/MonitorOwnerUserService";
+} from "Common/Server/Services/MonitorOwnerUserService";
 import MonitorProbeService, {
   Service as MonitorProbeServiceType,
-} from "CommonServer/Services/MonitorProbeService";
+} from "Common/Server/Services/MonitorProbeService";
 import MonitorSecretService, {
   Service as MonitorSecretServiceType,
-} from "CommonServer/Services/MonitorSecretService";
+} from "Common/Server/Services/MonitorSecretService";
 import MonitorService, {
   Service as MonitorServiceType,
-} from "CommonServer/Services/MonitorService";
+} from "Common/Server/Services/MonitorService";
 import MonitorStatusService, {
   Service as MonitorStatusServiceType,
-} from "CommonServer/Services/MonitorStatusService";
+} from "Common/Server/Services/MonitorStatusService";
 import MonitorTimelineStatusService, {
   Service as MonitorTimelineStatusServiceType,
-} from "CommonServer/Services/MonitorStatusTimelineService";
+} from "Common/Server/Services/MonitorStatusTimelineService";
 import OnCallDutyPolicyCustomFieldService, {
   Service as OnCallDutyPolicyCustomFieldServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyCustomFieldService";
+} from "Common/Server/Services/OnCallDutyPolicyCustomFieldService";
 import OnCallDutyPolicyEscalationRuleScheduleService, {
   Service as OnCallDutyPolicyEscalationRuleScheduleServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyEscalationRuleScheduleService";
+} from "Common/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService";
 import OnCallDutyPolicyEscalationRuleService, {
   Service as OnCallDutyPolicyEscalationRuleServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyEscalationRuleService";
+} from "Common/Server/Services/OnCallDutyPolicyEscalationRuleService";
 import OnCallDutyPolicyEscalationRuleTeamService, {
   Service as OnCallDutyPolicyEscalationRuleTeamServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyEscalationRuleTeamService";
+} from "Common/Server/Services/OnCallDutyPolicyEscalationRuleTeamService";
 import OnCallDutyPolicyEscalationRuleUserService, {
   Service as OnCallDutyPolicyEscalationRuleUserServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyEscalationRuleUserService";
+} from "Common/Server/Services/OnCallDutyPolicyEscalationRuleUserService";
 import OnCallDutyPolicyExecutionLogService, {
   Service as OnCallDutyPolicyExecutionLogServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyExecutionLogService";
+} from "Common/Server/Services/OnCallDutyPolicyExecutionLogService";
 import OnCallDutyPolicyExecutionLogTimelineService, {
   Service as OnCallDutyPolicyExecutionLogTimelineServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyExecutionLogTimelineService";
+} from "Common/Server/Services/OnCallDutyPolicyExecutionLogTimelineService";
 import OnCallDutyPolicyScheduleLayerService, {
   Service as OnCallDutyPolicyScheduleLayerServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyScheduleLayerService";
+} from "Common/Server/Services/OnCallDutyPolicyScheduleLayerService";
 import OnCallDutyPolicyScheduleLayerUserService, {
   Service as OnCallDutyPolicyScheduleLayerUserServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyScheduleLayerUserService";
+} from "Common/Server/Services/OnCallDutyPolicyScheduleLayerUserService";
 import OnCallDutyPolicyScheduleService, {
   Service as OnCallDutyPolicyScheduleServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyScheduleService";
+} from "Common/Server/Services/OnCallDutyPolicyScheduleService";
 import OnCallDutyPolicyService, {
   Service as OnCallDutyPolicyServiceType,
-} from "CommonServer/Services/OnCallDutyPolicyService";
+} from "Common/Server/Services/OnCallDutyPolicyService";
 import ProjectCallSMSConfigService, {
   Service as ProjectCallSMSConfigServiceType,
-} from "CommonServer/Services/ProjectCallSMSConfigService";
+} from "Common/Server/Services/ProjectCallSMSConfigService";
 import ProjectSmtpConfigService, {
   Service as ProjectSMTPConfigServiceType,
-} from "CommonServer/Services/ProjectSmtpConfigService";
+} from "Common/Server/Services/ProjectSmtpConfigService";
 import PromoCodeService, {
   Service as PromoCodeServiceType,
-} from "CommonServer/Services/PromoCodeService";
+} from "Common/Server/Services/PromoCodeService";
 import ResellerService, {
   Service as ResellerServiceType,
-} from "CommonServer/Services/ResellerService";
+} from "Common/Server/Services/ResellerService";
 import ScheduledMaintenanceCustomFieldService, {
   Service as ScheduledMaintenanceCustomFieldServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceCustomFieldService";
+} from "Common/Server/Services/ScheduledMaintenanceCustomFieldService";
 import ScheduledMaintenanceInternalNoteService, {
   Service as ScheduledMaintenanceInternalNoteServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceInternalNoteService";
+} from "Common/Server/Services/ScheduledMaintenanceInternalNoteService";
 import ScheduledMaintenanceNoteTemplateService, {
   Service as ScheduledMaintenanceNoteTemplateServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceNoteTemplateService";
+} from "Common/Server/Services/ScheduledMaintenanceNoteTemplateService";
 import ScheduledMaintenanceOwnerTeamService, {
   Service as ScheduledMaintenanceOwnerTeamServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceOwnerTeamService";
+} from "Common/Server/Services/ScheduledMaintenanceOwnerTeamService";
 import ScheduledMaintenanceOwnerUserService, {
   Service as ScheduledMaintenanceOwnerUserServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceOwnerUserService";
+} from "Common/Server/Services/ScheduledMaintenanceOwnerUserService";
 import ScheduledMaintenancePublicNoteService, {
   Service as ScheduledMaintenancePublicNoteServiceType,
-} from "CommonServer/Services/ScheduledMaintenancePublicNoteService";
+} from "Common/Server/Services/ScheduledMaintenancePublicNoteService";
 import ScheduledMaintenanceService, {
   Service as ScheduledMaintenanceServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceService";
+} from "Common/Server/Services/ScheduledMaintenanceService";
 import ScheduledMaintenanceStateService, {
   Service as ScheduledMaintenanceStateServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceStateService";
+} from "Common/Server/Services/ScheduledMaintenanceStateService";
 import ScheduledMaintenanceStateTimelineService, {
   Service as ScheduledMaintenanceStateTimelineServiceType,
-} from "CommonServer/Services/ScheduledMaintenanceStateTimelineService";
+} from "Common/Server/Services/ScheduledMaintenanceStateTimelineService";
 import ServiceCatalogOwnerTeamService, {
   Service as ServiceCatalogOwnerTeamServiceType,
-} from "CommonServer/Services/ServiceCatalogOwnerTeamService";
+} from "Common/Server/Services/ServiceCatalogOwnerTeamService";
 import ServiceCatalogOwnerUserService, {
   Service as ServiceCatalogOwnerUserServiceType,
-} from "CommonServer/Services/ServiceCatalogOwnerUserService";
+} from "Common/Server/Services/ServiceCatalogOwnerUserService";
 import ServiceCatalogService, {
   Service as ServiceCatalogServiceType,
-} from "CommonServer/Services/ServiceCatalogService";
+} from "Common/Server/Services/ServiceCatalogService";
 import ServiceCopilotCodeRepositoryService, {
   Service as ServiceCopilotCodeRepositoryType,
-} from "CommonServer/Services/ServiceCopilotCodeRepositoryService";
+} from "Common/Server/Services/ServiceCopilotCodeRepositoryService";
 import ServiceCatalogDependencyService, {
   Service as ServiceCatalogDependencyServiceType,
-} from "CommonServer/Services/ServiceCatalogDependencyService";
-import ServiceCatalogMonitor from "Model/Models/ServiceCatalogMonitor";
+} from "Common/Server/Services/ServiceCatalogDependencyService";
+import ServiceCatalogMonitor from "Common/Models/DatabaseModels/ServiceCatalogMonitor";
 import ServiceCatalogMonitorService, {
   Service as ServiceCatalogMonitorServiceType,
-} from "CommonServer/Services/ServiceCatalogMonitorService";
+} from "Common/Server/Services/ServiceCatalogMonitorService";
 
-import ServiceCatalogTelemetryService from "Model/Models/ServiceCatalogTelemetryService";
+import ServiceCatalogTelemetryService from "Common/Models/DatabaseModels/ServiceCatalogTelemetryService";
 import ServiceCatalogTelemetryServiceService, {
   Service as ServiceCatalogTelemetryServiceServiceType,
-} from "CommonServer/Services/ServiceCatalogTelemetryServiceService";
+} from "Common/Server/Services/ServiceCatalogTelemetryServiceService";
 
 import ShortLinkService, {
   Service as ShortLinkServiceType,
-} from "CommonServer/Services/ShortLinkService";
+} from "Common/Server/Services/ShortLinkService";
 import SmsLogService, {
   Service as SmsLogServiceType,
-} from "CommonServer/Services/SmsLogService";
+} from "Common/Server/Services/SmsLogService";
 import SpanService, {
   SpanService as SpanServiceType,
-} from "CommonServer/Services/SpanService";
+} from "Common/Server/Services/SpanService";
 import StatusPageAnnouncementService, {
   Service as StatusPageAnnouncementServiceType,
-} from "CommonServer/Services/StatusPageAnnouncementService";
+} from "Common/Server/Services/StatusPageAnnouncementService";
 import StatusPageCustomFieldService, {
   Service as StatusPageCustomFieldServiceType,
-} from "CommonServer/Services/StatusPageCustomFieldService";
+} from "Common/Server/Services/StatusPageCustomFieldService";
 import StatusPageFooterLinkService, {
   Service as StatusPageFooterLinkServiceType,
-} from "CommonServer/Services/StatusPageFooterLinkService";
+} from "Common/Server/Services/StatusPageFooterLinkService";
 import StatusPageGroupService, {
   Service as StatusPageGroupServiceType,
-} from "CommonServer/Services/StatusPageGroupService";
+} from "Common/Server/Services/StatusPageGroupService";
 import StatusPageHeaderLinkService, {
   Service as StatusPageHeaderLinkServiceType,
-} from "CommonServer/Services/StatusPageHeaderLinkService";
+} from "Common/Server/Services/StatusPageHeaderLinkService";
 import StatusPageHistoryChartBarColorRuleService, {
   Service as StatusPageHistoryChartBarColorRuleServiceType,
-} from "CommonServer/Services/StatusPageHistoryChartBarColorRuleService";
+} from "Common/Server/Services/StatusPageHistoryChartBarColorRuleService";
 import StatusPageOwnerTeamService, {
   Service as StatusPageOwnerTeamServiceType,
-} from "CommonServer/Services/StatusPageOwnerTeamService";
+} from "Common/Server/Services/StatusPageOwnerTeamService";
 import StatusPageOwnerUserService, {
   Service as StatusPageOwnerUserServiceType,
-} from "CommonServer/Services/StatusPageOwnerUserService";
+} from "Common/Server/Services/StatusPageOwnerUserService";
 import StatusPagePrivateUserService, {
   Service as StatusPagePrivateUserServiceType,
-} from "CommonServer/Services/StatusPagePrivateUserService";
+} from "Common/Server/Services/StatusPagePrivateUserService";
 import StatusPageResourceService, {
   Service as StatusPageResourceServiceType,
-} from "CommonServer/Services/StatusPageResourceService";
+} from "Common/Server/Services/StatusPageResourceService";
 import StatusPageSSOService, {
   Service as StatusPageSSOServiceType,
-} from "CommonServer/Services/StatusPageSsoService";
+} from "Common/Server/Services/StatusPageSsoService";
 import TeamMemberService, {
   TeamMemberService as TeamMemberServiceType,
-} from "CommonServer/Services/TeamMemberService";
+} from "Common/Server/Services/TeamMemberService";
 import TeamPermissionService, {
   Service as TeamPermissionServiceType,
-} from "CommonServer/Services/TeamPermissionService";
+} from "Common/Server/Services/TeamPermissionService";
 import TeamService, {
   Service as TeamServiceType,
-} from "CommonServer/Services/TeamService";
+} from "Common/Server/Services/TeamService";
 import TelemetryServiceService, {
   Service as TelemetryServiceServiceType,
-} from "CommonServer/Services/TelemetryServiceService";
+} from "Common/Server/Services/TelemetryServiceService";
 import TelemetryUsageBillingService, {
   Service as TelemetryUsageBillingServiceType,
-} from "CommonServer/Services/TelemetryUsageBillingService";
+} from "Common/Server/Services/TelemetryUsageBillingService";
 import UserNotificationRuleService, {
   Service as UserNotificationRuleServiceType,
-} from "CommonServer/Services/UserNotificationRuleService";
+} from "Common/Server/Services/UserNotificationRuleService";
 import UserNotificationSettingService, {
   Service as UserNotificationSettingServiceType,
-} from "CommonServer/Services/UserNotificationSettingService";
+} from "Common/Server/Services/UserNotificationSettingService";
 import UserOnCallLogService, {
   Service as UserNotificationLogServiceType,
-} from "CommonServer/Services/UserOnCallLogService";
+} from "Common/Server/Services/UserOnCallLogService";
 import UserService, {
   Service as UserServiceType,
-} from "CommonServer/Services/UserService";
+} from "Common/Server/Services/UserService";
 import WorkflowLogService, {
   Service as WorkflowLogServiceType,
-} from "CommonServer/Services/WorkflowLogService";
+} from "Common/Server/Services/WorkflowLogService";
 import WorkflowService, {
   Service as WorkflowServiceType,
-} from "CommonServer/Services/WorkflowService";
+} from "Common/Server/Services/WorkflowService";
 import WorkflowVariableService, {
   Service as WorkflowVariableServiceType,
-} from "CommonServer/Services/WorkflowVariableService";
+} from "Common/Server/Services/WorkflowVariableService";
 
 import ProbeOwnerTeamService, {
   Service as ProbeOwnerTeamServiceType,
-} from "CommonServer/Services/ProbeOwnerTeamService";
+} from "Common/Server/Services/ProbeOwnerTeamService";
 
 import ProbeOwnerUserService, {
   Service as ProbeOwnerUserServiceType,
-} from "CommonServer/Services/ProbeOwnerUserService";
+} from "Common/Server/Services/ProbeOwnerUserService";
 
-import FeatureSet from "CommonServer/Types/FeatureSet";
-import Express, { ExpressApplication } from "CommonServer/Utils/Express";
-import Log from "Model/AnalyticsModels/Log";
-import Metric from "Model/AnalyticsModels/Metric";
-import MonitorMetricsByMinute from "Model/AnalyticsModels/MonitorMetricsByMinute";
-import Span from "Model/AnalyticsModels/Span";
-import ApiKey from "Model/Models/ApiKey";
-import ApiKeyPermission from "Model/Models/ApiKeyPermission";
-import CallLog from "Model/Models/CallLog";
-import Domain from "Model/Models/Domain";
-import EmailLog from "Model/Models/EmailLog";
-import EmailVerificationToken from "Model/Models/EmailVerificationToken";
-import Incident from "Model/Models/Incident";
-import IncidentCustomField from "Model/Models/IncidentCustomField";
-import IncidentInternalNote from "Model/Models/IncidentInternalNote";
-import IncidentNoteTemplate from "Model/Models/IncidentNoteTemplate";
-import IncidentOwnerTeam from "Model/Models/IncidentOwnerTeam";
-import IncidentOwnerUser from "Model/Models/IncidentOwnerUser";
-import IncidentPublicNote from "Model/Models/IncidentPublicNote";
-import IncidentSeverity from "Model/Models/IncidentSeverity";
-import IncidentState from "Model/Models/IncidentState";
-import IncidentStateTimeline from "Model/Models/IncidentStateTimeline";
-import IncidentTemplate from "Model/Models/IncidentTemplate";
-import IncidentTemplateOwnerTeam from "Model/Models/IncidentTemplateOwnerTeam";
-import IncidentTemplateOwnerUser from "Model/Models/IncidentTemplateOwnerUser";
-import Label from "Model/Models/Label";
-import Monitor from "Model/Models/Monitor";
-import MonitorCustomField from "Model/Models/MonitorCustomField";
-import MonitorGroupOwnerTeam from "Model/Models/MonitorGroupOwnerTeam";
-import MonitorGroupOwnerUser from "Model/Models/MonitorGroupOwnerUser";
-import MonitorGroupResource from "Model/Models/MonitorGroupResource";
-import MonitorOwnerTeam from "Model/Models/MonitorOwnerTeam";
-import MonitorOwnerUser from "Model/Models/MonitorOwnerUser";
-import MonitorProbe from "Model/Models/MonitorProbe";
-import MonitorSecret from "Model/Models/MonitorSecret";
-import MonitorStatus from "Model/Models/MonitorStatus";
-import MonitorTimelineStatus from "Model/Models/MonitorStatusTimeline";
-import OnCallDutyPolicy from "Model/Models/OnCallDutyPolicy";
-import OnCallDutyPolicyCustomField from "Model/Models/OnCallDutyPolicyCustomField";
-import OnCallDutyPolicyEscalationRule from "Model/Models/OnCallDutyPolicyEscalationRule";
-import OnCallDutyPolicyEscalationRuleSchedule from "Model/Models/OnCallDutyPolicyEscalationRuleSchedule";
-import OnCallDutyPolicyEscalationRuleTeam from "Model/Models/OnCallDutyPolicyEscalationRuleTeam";
-import OnCallDutyPolicyEscalationRuleUser from "Model/Models/OnCallDutyPolicyEscalationRuleUser";
-import OnCallDutyPolicyExecutionLog from "Model/Models/OnCallDutyPolicyExecutionLog";
-import OnCallDutyPolicyExecutionLogTimeline from "Model/Models/OnCallDutyPolicyExecutionLogTimeline";
-import OnCallDutyPolicySchedule from "Model/Models/OnCallDutyPolicySchedule";
-import OnCallDutyPolicyScheduleLayer from "Model/Models/OnCallDutyPolicyScheduleLayer";
-import OnCallDutyPolicyScheduleLayerUser from "Model/Models/OnCallDutyPolicyScheduleLayerUser";
-import ProjectCallSMSConfig from "Model/Models/ProjectCallSMSConfig";
-import ProjectSmtpConfig from "Model/Models/ProjectSmtpConfig";
-import PromoCode from "Model/Models/PromoCode";
-import Reseller from "Model/Models/Reseller";
-import ScheduledMaintenance from "Model/Models/ScheduledMaintenance";
-import ScheduledMaintenanceCustomField from "Model/Models/ScheduledMaintenanceCustomField";
-import ScheduledMaintenanceInternalNote from "Model/Models/ScheduledMaintenanceInternalNote";
-import ScheduledMaintenanceNoteTemplate from "Model/Models/ScheduledMaintenanceNoteTemplate";
-import ScheduledMaintenanceOwnerTeam from "Model/Models/ScheduledMaintenanceOwnerTeam";
-import ScheduledMaintenanceOwnerUser from "Model/Models/ScheduledMaintenanceOwnerUser";
-import ScheduledMaintenancePublicNote from "Model/Models/ScheduledMaintenancePublicNote";
-import ScheduledMaintenanceState from "Model/Models/ScheduledMaintenanceState";
-import ScheduledMaintenanceStateTimeline from "Model/Models/ScheduledMaintenanceStateTimeline";
-import ServiceCatalog from "Model/Models/ServiceCatalog";
-import ServiceCatalogOwnerTeam from "Model/Models/ServiceCatalogOwnerTeam";
-import ServiceCatalogOwnerUser from "Model/Models/ServiceCatalogOwnerUser";
-import ServiceCopilotCodeRepository from "Model/Models/ServiceCopilotCodeRepository";
-import ShortLink from "Model/Models/ShortLink";
-import SmsLog from "Model/Models/SmsLog";
-import StatusPageAnnouncement from "Model/Models/StatusPageAnnouncement";
+import TelemetryExceptionService, {
+  Service as TelemetryExceptionServiceType,
+} from "Common/Server/Services/TelemetryExceptionService";
+
+import ExceptionInstanceService, {
+  ExceptionInstanceService as ExceptionInstanceServiceType,
+} from "Common/Server/Services/ExceptionInstanceService";
+
+import FeatureSet from "Common/Server/Types/FeatureSet";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
+import Log from "Common/Models/AnalyticsModels/Log";
+import Metric from "Common/Models/AnalyticsModels/Metric";
+import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
+import Span from "Common/Models/AnalyticsModels/Span";
+import ApiKey from "Common/Models/DatabaseModels/ApiKey";
+import ApiKeyPermission from "Common/Models/DatabaseModels/ApiKeyPermission";
+import CallLog from "Common/Models/DatabaseModels/CallLog";
+import Domain from "Common/Models/DatabaseModels/Domain";
+import EmailLog from "Common/Models/DatabaseModels/EmailLog";
+import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
+import Incident from "Common/Models/DatabaseModels/Incident";
+import IncidentCustomField from "Common/Models/DatabaseModels/IncidentCustomField";
+import IncidentInternalNote from "Common/Models/DatabaseModels/IncidentInternalNote";
+import IncidentNoteTemplate from "Common/Models/DatabaseModels/IncidentNoteTemplate";
+import IncidentOwnerTeam from "Common/Models/DatabaseModels/IncidentOwnerTeam";
+import IncidentOwnerUser from "Common/Models/DatabaseModels/IncidentOwnerUser";
+import IncidentPublicNote from "Common/Models/DatabaseModels/IncidentPublicNote";
+import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity";
+import IncidentState from "Common/Models/DatabaseModels/IncidentState";
+import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline";
+import IncidentTemplate from "Common/Models/DatabaseModels/IncidentTemplate";
+import IncidentTemplateOwnerTeam from "Common/Models/DatabaseModels/IncidentTemplateOwnerTeam";
+import IncidentTemplateOwnerUser from "Common/Models/DatabaseModels/IncidentTemplateOwnerUser";
+import Label from "Common/Models/DatabaseModels/Label";
+import Monitor from "Common/Models/DatabaseModels/Monitor";
+import MonitorCustomField from "Common/Models/DatabaseModels/MonitorCustomField";
+import MonitorGroupOwnerTeam from "Common/Models/DatabaseModels/MonitorGroupOwnerTeam";
+import MonitorGroupOwnerUser from "Common/Models/DatabaseModels/MonitorGroupOwnerUser";
+import MonitorGroupResource from "Common/Models/DatabaseModels/MonitorGroupResource";
+import MonitorOwnerTeam from "Common/Models/DatabaseModels/MonitorOwnerTeam";
+import MonitorOwnerUser from "Common/Models/DatabaseModels/MonitorOwnerUser";
+import MonitorProbe from "Common/Models/DatabaseModels/MonitorProbe";
+import MonitorSecret from "Common/Models/DatabaseModels/MonitorSecret";
+import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus";
+import MonitorTimelineStatus from "Common/Models/DatabaseModels/MonitorStatusTimeline";
+import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy";
+import OnCallDutyPolicyCustomField from "Common/Models/DatabaseModels/OnCallDutyPolicyCustomField";
+import OnCallDutyPolicyEscalationRule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRule";
+import OnCallDutyPolicyEscalationRuleSchedule from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleSchedule";
+import OnCallDutyPolicyEscalationRuleTeam from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleTeam";
+import OnCallDutyPolicyEscalationRuleUser from "Common/Models/DatabaseModels/OnCallDutyPolicyEscalationRuleUser";
+import OnCallDutyPolicyExecutionLog from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog";
+import OnCallDutyPolicyExecutionLogTimeline from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline";
+import OnCallDutyPolicySchedule from "Common/Models/DatabaseModels/OnCallDutyPolicySchedule";
+import OnCallDutyPolicyScheduleLayer from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayer";
+import OnCallDutyPolicyScheduleLayerUser from "Common/Models/DatabaseModels/OnCallDutyPolicyScheduleLayerUser";
+import ProjectCallSMSConfig from "Common/Models/DatabaseModels/ProjectCallSMSConfig";
+import ProjectSmtpConfig from "Common/Models/DatabaseModels/ProjectSmtpConfig";
+import PromoCode from "Common/Models/DatabaseModels/PromoCode";
+import Reseller from "Common/Models/DatabaseModels/Reseller";
+import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance";
+import ScheduledMaintenanceCustomField from "Common/Models/DatabaseModels/ScheduledMaintenanceCustomField";
+import ScheduledMaintenanceInternalNote from "Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote";
+import ScheduledMaintenanceNoteTemplate from "Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate";
+import ScheduledMaintenanceOwnerTeam from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam";
+import ScheduledMaintenanceOwnerUser from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser";
+import ScheduledMaintenancePublicNote from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote";
+import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState";
+import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline";
+import ServiceCatalog from "Common/Models/DatabaseModels/ServiceCatalog";
+import ServiceCatalogOwnerTeam from "Common/Models/DatabaseModels/ServiceCatalogOwnerTeam";
+import ServiceCatalogOwnerUser from "Common/Models/DatabaseModels/ServiceCatalogOwnerUser";
+import ServiceCopilotCodeRepository from "Common/Models/DatabaseModels/ServiceCopilotCodeRepository";
+import ShortLink from "Common/Models/DatabaseModels/ShortLink";
+import SmsLog from "Common/Models/DatabaseModels/SmsLog";
+import StatusPageAnnouncement from "Common/Models/DatabaseModels/StatusPageAnnouncement";
 // Custom Fields API
-import StatusPageCustomField from "Model/Models/StatusPageCustomField";
-import StatusPageFooterLink from "Model/Models/StatusPageFooterLink";
-import StatusPageGroup from "Model/Models/StatusPageGroup";
-import StatusPageHeaderLink from "Model/Models/StatusPageHeaderLink";
-import TelemetryIngestionKey from "Model/Models/TelemetryIngestionKey";
-import StatusPageHistoryChartBarColorRule from "Model/Models/StatusPageHistoryChartBarColorRule";
-import StatusPageOwnerTeam from "Model/Models/StatusPageOwnerTeam";
-import StatusPageOwnerUser from "Model/Models/StatusPageOwnerUser";
-import StatusPagePrivateUser from "Model/Models/StatusPagePrivateUser";
-import StatusPageResource from "Model/Models/StatusPageResource";
-import StatusPageSSO from "Model/Models/StatusPageSso";
-import Team from "Model/Models/Team";
-import TeamMember from "Model/Models/TeamMember";
-import TeamPermission from "Model/Models/TeamPermission";
-import TelemetryService from "Model/Models/TelemetryService";
-import TelemetryUsageBilling from "Model/Models/TelemetryUsageBilling";
-import User from "Model/Models/User";
-import UserNotificationRule from "Model/Models/UserNotificationRule";
-import UserNotificationSetting from "Model/Models/UserNotificationSetting";
-import UserOnCallLog from "Model/Models/UserOnCallLog";
-import Workflow from "Model/Models/Workflow";
-import WorkflowLog from "Model/Models/WorkflowLog";
-import WorkflowVariable from "Model/Models/WorkflowVariable";
-import ProbeOwnerTeam from "Model/Models/ProbeOwnerTeam";
-import ProbeOwnerUser from "Model/Models/ProbeOwnerUser";
-import ServiceCatalogDependency from "Model/Models/ServiceCatalogDependency";
-import TelemetryAttribute from "Model/AnalyticsModels/TelemetryAttribute";
+import StatusPageCustomField from "Common/Models/DatabaseModels/StatusPageCustomField";
+import StatusPageFooterLink from "Common/Models/DatabaseModels/StatusPageFooterLink";
+import StatusPageGroup from "Common/Models/DatabaseModels/StatusPageGroup";
+import StatusPageHeaderLink from "Common/Models/DatabaseModels/StatusPageHeaderLink";
+import TelemetryIngestionKey from "Common/Models/DatabaseModels/TelemetryIngestionKey";
+import StatusPageHistoryChartBarColorRule from "Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule";
+import StatusPageOwnerTeam from "Common/Models/DatabaseModels/StatusPageOwnerTeam";
+import StatusPageOwnerUser from "Common/Models/DatabaseModels/StatusPageOwnerUser";
+import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
+import StatusPageResource from "Common/Models/DatabaseModels/StatusPageResource";
+import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
+import Team from "Common/Models/DatabaseModels/Team";
+import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import TeamPermission from "Common/Models/DatabaseModels/TeamPermission";
+import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
+import TelemetryUsageBilling from "Common/Models/DatabaseModels/TelemetryUsageBilling";
+import User from "Common/Models/DatabaseModels/User";
+import UserNotificationRule from "Common/Models/DatabaseModels/UserNotificationRule";
+import UserNotificationSetting from "Common/Models/DatabaseModels/UserNotificationSetting";
+import UserOnCallLog from "Common/Models/DatabaseModels/UserOnCallLog";
+import Workflow from "Common/Models/DatabaseModels/Workflow";
+import WorkflowLog from "Common/Models/DatabaseModels/WorkflowLog";
+import WorkflowVariable from "Common/Models/DatabaseModels/WorkflowVariable";
+import ProbeOwnerTeam from "Common/Models/DatabaseModels/ProbeOwnerTeam";
+import ProbeOwnerUser from "Common/Models/DatabaseModels/ProbeOwnerUser";
+import ServiceCatalogDependency from "Common/Models/DatabaseModels/ServiceCatalogDependency";
+import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
+import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance";
+import TelemetyException from "Common/Models/DatabaseModels/TelemetryException";
 
 const BaseAPIFeatureSet: FeatureSet = {
   init: async (): Promise<void> => {
@@ -430,6 +440,22 @@ const BaseAPIFeatureSet: FeatureSet = {
       ).getRouter(),
     );
 
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAnalyticsAPI<ExceptionInstance, ExceptionInstanceServiceType>(
+        ExceptionInstance,
+        ExceptionInstanceService,
+      ).getRouter(),
+    );
+
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<TelemetyException, TelemetryExceptionServiceType>(
+        TelemetyException,
+        TelemetryExceptionService,
+      ).getRouter(),
+    );
+
     app.use(
       `/${APP_NAME.toLocaleLowerCase()}`,
       new BaseAnalyticsAPI<Log, LogServiceType>(Log, LogService).getRouter(),

App/FeatureSet/Docs/Content/copilot/introduction.md

@@ -107,7 +107,7 @@ jobs:
 
     steps:
       
-    # Run Reliability Copilot in Doker Container
+    # Run Reliability Copilot in Docker Container
     - name: Run Copilot
       run: |
         docker run --rm  \ 

App/FeatureSet/Docs/Index.ts

@@ -1,16 +1,16 @@
 import { ContentPath, StaticPath, ViewsPath } from "./Utils/Config";
 import DocsNav, { NavGroup, NavLink } from "./Utils/Nav";
 import DocsRender from "./Utils/Render";
-import FeatureSet from "CommonServer/Types/FeatureSet";
+import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, {
   ExpressApplication,
   ExpressRequest,
   ExpressResponse,
   ExpressStatic,
-} from "CommonServer/Utils/Express";
-import Response from "CommonServer/Utils/Response";
-import LocalFile from "CommonServer/Utils/LocalFile";
-import logger from "CommonServer/Utils/Logger";
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
+import LocalFile from "Common/Server/Utils/LocalFile";
+import logger from "Common/Server/Utils/Logger";
 import "ejs";
 
 const DocsFeatureSet: FeatureSet = {

App/FeatureSet/Docs/Utils/Render.ts

@@ -1,4 +1,4 @@
-import Markdown, { MarkdownContentType } from "CommonServer/Types/Markdown";
+import Markdown, { MarkdownContentType } from "Common/Server/Types/Markdown";
 
 // This class is responsible for rendering markdown content to HTML
 export default class DocsRender {

App/FeatureSet/Home/API/BlogAPI.ts

@@ -7,8 +7,8 @@ import Express, {
   ExpressApplication,
   ExpressRequest,
   ExpressResponse,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
 
 const app: ExpressApplication = Express.getExpressApp();
 

App/FeatureSet/Home/Index.ts

@@ -10,13 +10,13 @@ import OneUptimeDate from "Common/Types/Date";
 import Dictionary from "Common/Types/Dictionary";
 import { JSONObject } from "Common/Types/JSON";
 import API from "Common/Utils/API";
-import FeatureSet from "CommonServer/Types/FeatureSet";
+import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, {
   ExpressApplication,
   ExpressRequest,
   ExpressResponse,
   ExpressStatic,
-} from "CommonServer/Utils/Express";
+} from "Common/Server/Utils/Express";
 import "ejs";
 import builder from "xmlbuilder2";
 import { XMLBuilder } from "xmlbuilder2/lib/interfaces";

App/FeatureSet/Home/Utils/BlogPost.ts

@@ -1,5 +1,5 @@
-import AnalyticsBaseModel from "Common/AnalyticsModels/BaseModel";
-import BaseModel from "Common/Models/BaseModel";
+import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
 import HTTPResponse from "Common/Types/API/HTTPResponse";
 import URL from "Common/Types/API/URL";
@@ -9,8 +9,8 @@ import { JSONArray, JSONObject, JSONObjectOrArray } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import Text from "Common/Types/Text";
 import API from "Common/Utils/API";
-import LocalCache from "CommonServer/Infrastructure/LocalCache";
-import Markdown, { MarkdownContentType } from "CommonServer/Types/Markdown";
+import LocalCache from "Common/Server/Infrastructure/LocalCache";
+import Markdown, { MarkdownContentType } from "Common/Server/Types/Markdown";
 
 export interface BlogPostAuthor {
   username: string;

App/FeatureSet/Home/Utils/NotFound.ts

@@ -1,5 +1,5 @@
 import { ViewsPath } from "./Config";
-import { ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressResponse } from "Common/Server/Utils/Express";
 
 export default class NotFoundUtil {
   public static renderNotFound(res: ExpressResponse): void {

App/FeatureSet/Home/Utils/OSSFriends.ts

@@ -37,6 +37,12 @@ const OSSFriends: OSSFriend[] = [
       "PostHog is open-source product analytics, built for developers.",
     repositoryUrl: URL.fromString("https://github.com/PostHog/posthog"),
   },
+  {
+    name: "Twenty",
+    description:
+      "Twenty is building an open-source modern CRM. It's alternative to Salesforce and HubSpot.",
+    repositoryUrl: URL.fromString("https://github.com/twentyhq/twenty"),
+  },
 ];
 
 export default OSSFriends;

App/FeatureSet/Home/Utils/Reviews.ts

@@ -5,16 +5,6 @@ export interface Review {
 }
 
 const reviews: Review[] = [
-  {
-    name: "Alice",
-    text: "OneUptime has been a game-changer for our team. The alerts are timely and the status page keeps our customers informed.",
-    title: "Game-changer!",
-  },
-  {
-    name: "Bob",
-    text: "The incident management feature is top-notch. It has streamlined our response process significantly.",
-    title: "Top-notch incident management",
-  },
   {
     name: "Charlie",
     text: "I love the on-call rotation setup. It has made scheduling so much easier.",
@@ -75,6 +65,16 @@ const reviews: Review[] = [
     text: "The log analysis feature is very detailed and insightful.",
     title: "Detailed log analysis",
   },
+  {
+    name: "Anderson, GK2 Cloud",
+    text: "Thanks for building OneUptime, it really is fantastic. We are getting more excited every day!",
+    title: "OneUptime is fantastic!",
+  },
+  {
+    name: "Reg, Skillable",
+    text: "We use OneUptime to reliably monitor endpoint availability globally, and it delivers.",
+    title: "OneUptime delivers!",
+  },
   {
     name: "Oscar",
     text: "OneUptime has made our monitoring process much more efficient.",

App/FeatureSet/Home/Utils/ServerError.ts

@@ -1,5 +1,5 @@
 import { ViewsPath } from "./Config";
-import { ExpressResponse } from "CommonServer/Utils/Express";
+import { ExpressResponse } from "Common/Server/Utils/Express";
 
 export default class ServerErrorUtil {
   public static renderServerError(res: ExpressResponse): void {

App/FeatureSet/Home/Views/Blog/List.ejs

@@ -20,7 +20,7 @@
     <div class="relative isolate overflow-hidden bg-white">
       <div class="py-24 sm:py-32">
 
-        <%- include('./Partials/BlogTitleAndDescription', { title: 'Engineering Uptime - Blog by OneUptime', description: 'Latest posts on Observability, Monitoring, Reliability and more.' }) -%>
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Engineering Uptime', smallTitle: '- Blog by OneUptime', description: 'Latest posts on Observability, Monitoring, Reliability and more.' }) -%>
 
         <div class="mx-auto max-w-7xl px-6 lg:px-8">
           

App/FeatureSet/Home/Views/Blog/ListByTag.ejs

@@ -20,7 +20,7 @@
     <div class="relative isolate overflow-hidden bg-white">
       <div class="py-24 sm:py-32">
 
-        <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, description: 'Here are some of the latest posts on '+tagName }) -%>
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, smallTitle: "", description: 'Here are some of the latest posts on '+tagName }) -%>
 
         <div class="mx-auto max-w-7xl px-6 lg:px-8">
           

App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs

@@ -3,6 +3,13 @@
     <h1 class="max-w-5xl text-center text-6xl font-bold text-gray-900 leading-tight">
         <%= title %>
     </h1>
+    </div>
+    <div class="mx-auto flex justify-center text-center ">
+    <%  if(smallTitle){ %> 
+    <h3 class="max-w-5xl mt-5 text-center text-2xl font-medium text-gray-900 leading-tight">
+      <%= smallTitle %>
+    </h3>
+    <% } %>
   </div>
   <p class="text-2xl text-center leading-8 text-gray-600 mt-8 leading-normal">
     <%= description %>

App/FeatureSet/Home/Views/Blog/Post.ejs

@@ -73,7 +73,7 @@
             <div class="py-24 sm:py-32">
                 <div class="mx-auto max-w-7xl px-6 lg:px-8">
 
-                    <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , description:
+                    <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , smallTitle: "", description:
                         blogPost.description }) -%>
 
 

App/FeatureSet/Home/Views/Partials/copilot.ejs

@@ -111,7 +111,7 @@
                 </svg>
                 
                 <span><strong class="font-semibold text-gray-900">
-                    We don't store or train on your code.
+                    We don't see, store or train on your code.
                   </strong>
                   Regardless whether you are on the free tier or enterprise tier, we don't store or train on your code. No part of your code is sent to us.
                 </span>

App/FeatureSet/Home/Views/pricing.ejs

@@ -344,7 +344,7 @@
                       d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z"
                       clip-rule="evenodd" />
                   </svg>
-                  <span class="text-sm text-gray-500">Dedicated Support Channel</span>
+                  <span class="text-sm text-gray-500">Deployed on Multi Cloud</span>
                 </li>
 
                 <li class="flex space-x-3">

App/FeatureSet/Identity/API/Authentication.ts

@@ -1,5 +1,5 @@
 import AuthenticationEmail from "../Utils/AuthenticationEmail";
-import BaseModel from "Common/Models/BaseModel";
+import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import { AccountsRoute } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
@@ -15,29 +15,29 @@ import { JSONObject } from "Common/Types/JSON";
 import Name from "Common/Types/Name";
 import ObjectID from "Common/Types/ObjectID";
 import PositiveNumber from "Common/Types/PositiveNumber";
-import DatabaseConfig from "CommonServer/DatabaseConfig";
+import DatabaseConfig from "Common/Server/DatabaseConfig";
 import {
   EncryptionSecret,
   IsBillingEnabled,
-} from "CommonServer/EnvironmentConfig";
-import AccessTokenService from "CommonServer/Services/AccessTokenService";
-import EmailVerificationTokenService from "CommonServer/Services/EmailVerificationTokenService";
-import MailService from "CommonServer/Services/MailService";
-import UserService from "CommonServer/Services/UserService";
-import UserTwoFactorAuthService from "CommonServer/Services/UserTwoFactorAuthService";
-import CookieUtil from "CommonServer/Utils/Cookie";
+} from "Common/Server/EnvironmentConfig";
+import AccessTokenService from "Common/Server/Services/AccessTokenService";
+import EmailVerificationTokenService from "Common/Server/Services/EmailVerificationTokenService";
+import MailService from "Common/Server/Services/MailService";
+import UserService from "Common/Server/Services/UserService";
+import UserTwoFactorAuthService from "Common/Server/Services/UserTwoFactorAuthService";
+import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import TwoFactorAuth from "CommonServer/Utils/TwoFactorAuth";
-import EmailVerificationToken from "Model/Models/EmailVerificationToken";
-import User from "Model/Models/User";
-import UserTwoFactorAuth from "Model/Models/UserTwoFactorAuth";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import TwoFactorAuth from "Common/Server/Utils/TwoFactorAuth";
+import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
+import User from "Common/Models/DatabaseModels/User";
+import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Identity/API/Reseller.ts

@@ -1,15 +1,15 @@
 import OneUptimeDate from "Common/Types/Date";
 import BadDataException from "Common/Types/Exception/BadDataException";
-import ResellerService from "CommonServer/Services/ResellerService";
+import ResellerService from "Common/Server/Services/ResellerService";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
-} from "CommonServer/Utils/Express";
-import JSONWebToken from "CommonServer/Utils/JsonWebToken";
-import Response from "CommonServer/Utils/Response";
-import Reseller from "Model/Models/Reseller";
+} from "Common/Server/Utils/Express";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
+import Response from "Common/Server/Utils/Response";
+import Reseller from "Common/Models/DatabaseModels/Reseller";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Identity/API/SSO.ts

@@ -14,27 +14,27 @@ import ServerException from "Common/Types/Exception/ServerException";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
 import PositiveNumber from "Common/Types/PositiveNumber";
-import DatabaseConfig from "CommonServer/DatabaseConfig";
-import { Host, HttpProtocol } from "CommonServer/EnvironmentConfig";
-import AccessTokenService from "CommonServer/Services/AccessTokenService";
-import ProjectSSOService from "CommonServer/Services/ProjectSsoService";
-import TeamMemberService from "CommonServer/Services/TeamMemberService";
-import UserService from "CommonServer/Services/UserService";
-import QueryHelper from "CommonServer/Types/Database/QueryHelper";
-import Select from "CommonServer/Types/Database/Select";
-import CookieUtil from "CommonServer/Utils/Cookie";
+import DatabaseConfig from "Common/Server/DatabaseConfig";
+import { Host, HttpProtocol } from "Common/Server/EnvironmentConfig";
+import AccessTokenService from "Common/Server/Services/AccessTokenService";
+import ProjectSSOService from "Common/Server/Services/ProjectSsoService";
+import TeamMemberService from "Common/Server/Services/TeamMemberService";
+import UserService from "Common/Server/Services/UserService";
+import QueryHelper from "Common/Server/Types/Database/QueryHelper";
+import Select from "Common/Server/Types/Database/Select";
+import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import Project from "Model/Models/Project";
-import ProjectSSO from "Model/Models/ProjectSso";
-import TeamMember from "Model/Models/TeamMember";
-import User from "Model/Models/User";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import Project from "Common/Models/DatabaseModels/Project";
+import ProjectSSO from "Common/Models/DatabaseModels/ProjectSso";
+import TeamMember from "Common/Models/DatabaseModels/TeamMember";
+import User from "Common/Models/DatabaseModels/User";
 import xml2js from "xml2js";
 
 const router: ExpressRouter = Express.getRouter();

App/FeatureSet/Identity/API/StatusPageAuthentication.ts

@@ -1,4 +1,4 @@
-import BaseModel from "Common/Models/BaseModel";
+import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import { FileRoute } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
@@ -10,23 +10,23 @@ import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import PositiveNumber from "Common/Types/PositiveNumber";
-import DatabaseConfig from "CommonServer/DatabaseConfig";
-import { EncryptionSecret } from "CommonServer/EnvironmentConfig";
-import MailService from "CommonServer/Services/MailService";
-import StatusPagePrivateUserService from "CommonServer/Services/StatusPagePrivateUserService";
-import StatusPageService from "CommonServer/Services/StatusPageService";
-import CookieUtil from "CommonServer/Utils/Cookie";
+import DatabaseConfig from "Common/Server/DatabaseConfig";
+import { EncryptionSecret } from "Common/Server/EnvironmentConfig";
+import MailService from "Common/Server/Services/MailService";
+import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
+import StatusPageService from "Common/Server/Services/StatusPageService";
+import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
-} from "CommonServer/Utils/Express";
-import JSONWebToken from "CommonServer/Utils/JsonWebToken";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import StatusPage from "Model/Models/StatusPage";
-import StatusPagePrivateUser from "Model/Models/StatusPagePrivateUser";
+} from "Common/Server/Utils/Express";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import StatusPage from "Common/Models/DatabaseModels/StatusPage";
+import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Identity/API/StatusPageSSO.ts

@@ -9,22 +9,22 @@ import HashedString from "Common/Types/HashedString";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
 import PositiveNumber from "Common/Types/PositiveNumber";
-import { Host, HttpProtocol } from "CommonServer/EnvironmentConfig";
-import StatusPagePrivateUserService from "CommonServer/Services/StatusPagePrivateUserService";
-import StatusPageService from "CommonServer/Services/StatusPageService";
-import StatusPageSsoService from "CommonServer/Services/StatusPageSsoService";
-import CookieUtil from "CommonServer/Utils/Cookie";
+import { Host, HttpProtocol } from "Common/Server/EnvironmentConfig";
+import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
+import StatusPageService from "Common/Server/Services/StatusPageService";
+import StatusPageSsoService from "Common/Server/Services/StatusPageSsoService";
+import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
   NextFunction,
-} from "CommonServer/Utils/Express";
-import JSONWebToken from "CommonServer/Utils/JsonWebToken";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import StatusPagePrivateUser from "Model/Models/StatusPagePrivateUser";
-import StatusPageSSO from "Model/Models/StatusPageSso";
+} from "Common/Server/Utils/Express";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
+import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
 import xml2js from "xml2js";
 
 const router: ExpressRouter = Express.getRouter();

App/FeatureSet/Identity/Index.ts

@@ -3,8 +3,8 @@ import ResellerAPI from "./API/Reseller";
 import SsoAPI from "./API/SSO";
 import StatusPageAuthenticationAPI from "./API/StatusPageAuthentication";
 import StatusPageSsoAPI from "./API/StatusPageSSO";
-import FeatureSet from "CommonServer/Types/FeatureSet";
-import Express, { ExpressApplication } from "CommonServer/Utils/Express";
+import FeatureSet from "Common/Server/Types/FeatureSet";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import "ejs";
 
 const IdentityFeatureSet: FeatureSet = {

App/FeatureSet/Identity/Utils/AuthenticationEmail.ts

@@ -7,12 +7,12 @@ import OneUptimeDate from "Common/Types/Date";
 import Email from "Common/Types/Email";
 import EmailTemplateType from "Common/Types/Email/EmailTemplateType";
 import ObjectID from "Common/Types/ObjectID";
-import DatabaseConfig from "CommonServer/DatabaseConfig";
-import EmailVerificationTokenService from "CommonServer/Services/EmailVerificationTokenService";
-import MailService from "CommonServer/Services/MailService";
-import logger from "CommonServer/Utils/Logger";
-import EmailVerificationToken from "Model/Models/EmailVerificationToken";
-import User from "Model/Models/User";
+import DatabaseConfig from "Common/Server/DatabaseConfig";
+import EmailVerificationTokenService from "Common/Server/Services/EmailVerificationTokenService";
+import MailService from "Common/Server/Services/MailService";
+import logger from "Common/Server/Utils/Logger";
+import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
+import User from "Common/Models/DatabaseModels/User";
 
 export default class AuthenticationEmail {
   public static async sendVerificationEmail(user: User): Promise<void> {

App/FeatureSet/Identity/Utils/SSO.ts

@@ -4,7 +4,7 @@ import Email from "Common/Types/Email";
 import BadRequestException from "Common/Types/Exception/BadRequestException";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
 import Text from "Common/Types/Text";
-import logger from "CommonServer/Utils/Logger";
+import logger from "Common/Server/Utils/Logger";
 import xmlCrypto, { FileKeyInfo } from "xml-crypto";
 import xmldom from "xmldom";
 import zlib from "zlib";

App/FeatureSet/Notification/API/Call.ts

@@ -6,16 +6,16 @@ import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import Phone from "Common/Types/Phone";
-import ClusterKeyAuthorization from "CommonServer/Middleware/ClusterKeyAuthorization";
-import ProjectCallSMSConfigService from "CommonServer/Services/ProjectCallSMSConfigService";
+import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
+import ProjectCallSMSConfigService from "Common/Server/Services/ProjectCallSMSConfigService";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import ProjectCallSMSConfig from "Model/Models/ProjectCallSMSConfig";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import ProjectCallSMSConfig from "Common/Models/DatabaseModels/ProjectCallSMSConfig";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Notification/API/Mail.ts

@@ -6,13 +6,13 @@ import EmailServer from "Common/Types/Email/EmailServer";
 import EmailTemplateType from "Common/Types/Email/EmailTemplateType";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
-import ClusterKeyAuthorization from "CommonServer/Middleware/ClusterKeyAuthorization";
+import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
-} from "CommonServer/Utils/Express";
-import Response from "CommonServer/Utils/Response";
+} from "Common/Server/Utils/Express";
+import Response from "Common/Server/Utils/Response";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Notification/API/SMS.ts

@@ -5,16 +5,16 @@ import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import Phone from "Common/Types/Phone";
-import ClusterKeyAuthorization from "CommonServer/Middleware/ClusterKeyAuthorization";
-import ProjectCallSMSConfigService from "CommonServer/Services/ProjectCallSMSConfigService";
+import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
+import ProjectCallSMSConfigService from "Common/Server/Services/ProjectCallSMSConfigService";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import ProjectCallSMSConfig from "Model/Models/ProjectCallSMSConfig";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import ProjectCallSMSConfig from "Common/Models/DatabaseModels/ProjectCallSMSConfig";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Notification/API/SMTPConfig.ts

@@ -6,15 +6,15 @@ import EmailTemplateType from "Common/Types/Email/EmailTemplateType";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
-import ProjectSMTPConfigService from "CommonServer/Services/ProjectSmtpConfigService";
+import ProjectSMTPConfigService from "Common/Server/Services/ProjectSmtpConfigService";
 import Express, {
   ExpressRequest,
   ExpressResponse,
   ExpressRouter,
-} from "CommonServer/Utils/Express";
-import logger from "CommonServer/Utils/Logger";
-import Response from "CommonServer/Utils/Response";
-import ProjectSmtpConfig from "Model/Models/ProjectSmtpConfig";
+} from "Common/Server/Utils/Express";
+import logger from "Common/Server/Utils/Logger";
+import Response from "Common/Server/Utils/Response";
+import ProjectSmtpConfig from "Common/Models/DatabaseModels/ProjectSmtpConfig";
 
 const router: ExpressRouter = Express.getRouter();
 

App/FeatureSet/Notification/Config.ts

@@ -5,9 +5,11 @@ import EmailServer from "Common/Types/Email/EmailServer";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import ObjectID from "Common/Types/ObjectID";
 import Port from "Common/Types/Port";
-import { AdminDashboardClientURL } from "CommonServer/EnvironmentConfig";
-import GlobalConfigService from "CommonServer/Services/GlobalConfigService";
-import GlobalConfig, { EmailServerType } from "Model/Models/GlobalConfig";
+import { AdminDashboardClientURL } from "Common/Server/EnvironmentConfig";
+import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
+import GlobalConfig, {
+  EmailServerType,
+} from "Common/Models/DatabaseModels/GlobalConfig";
 
 export const InternalSmtpPassword: string =
   process.env["INTERNAL_SMTP_PASSWORD"] || "";

App/FeatureSet/Notification/Index.ts

@@ -4,8 +4,8 @@ import MailAPI from "./API/Mail";
 import SmsAPI from "./API/SMS";
 import SMTPConfigAPI from "./API/SMTPConfig";
 import "./Utils/Handlebars";
-import FeatureSet from "CommonServer/Types/FeatureSet";
-import Express, { ExpressApplication } from "CommonServer/Utils/Express";
+import FeatureSet from "Common/Server/Types/FeatureSet";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import "ejs";
 
 const NotificationFeatureSet: FeatureSet = {

App/FeatureSet/Notification/Services/CallService.ts

@@ -15,15 +15,15 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import UserNotificationStatus from "Common/Types/UserNotification/UserNotificationStatus";
-import { IsBillingEnabled } from "CommonServer/EnvironmentConfig";
-import CallLogService from "CommonServer/Services/CallLogService";
-import NotificationService from "CommonServer/Services/NotificationService";
-import ProjectService from "CommonServer/Services/ProjectService";
-import UserOnCallLogTimelineService from "CommonServer/Services/UserOnCallLogTimelineService";
-import JSONWebToken from "CommonServer/Utils/JsonWebToken";
-import logger from "CommonServer/Utils/Logger";
-import CallLog from "Model/Models/CallLog";
-import Project from "Model/Models/Project";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
+import CallLogService from "Common/Server/Services/CallLogService";
+import NotificationService from "Common/Server/Services/NotificationService";
+import ProjectService from "Common/Server/Services/ProjectService";
+import UserOnCallLogTimelineService from "Common/Server/Services/UserOnCallLogTimelineService";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
+import logger from "Common/Server/Utils/Logger";
+import CallLog from "Common/Models/DatabaseModels/CallLog";
+import Project from "Common/Models/DatabaseModels/Project";
 import Twilio from "twilio";
 import { CallInstance } from "twilio/lib/rest/api/v2010/account/call";