refactor: Update import statements for ProbeMonitor and ServerMonitor to use ProbeMonitorResponse and ServerMonitorResponse

.github/workflows/compile.yml

@@ -20,8 +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
@@ -36,7 +34,6 @@ 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
 
@@ -50,8 +47,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 && npm run compile && npm run dep-check
 
   compile-common-project:
@@ -63,9 +58,7 @@ jobs:
       - 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
+      - run: cd Common && npm install && npm run compile && npm run dep-check
 
   compile-common-ui:
     runs-on: ubuntu-latest
@@ -77,8 +70,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 CommonUI && npm install --force && npm run compile && npm run dep-check
 
   compile-common:
@@ -90,9 +81,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,8 +93,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 App && npm install && npm run compile && npm run dep-check
@@ -120,8 +107,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
 
@@ -135,8 +120,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 Nginx && npm install && npm run compile && npm run dep-check
@@ -162,8 +145,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 AdminDashboard && npm install && npm run compile && npm run dep-check
@@ -178,8 +159,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 Dashboard && npm install && npm run compile && npm run dep-check
@@ -194,10 +173,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
-      - 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-e2e:
     runs-on: ubuntu-latest
@@ -209,7 +185,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,8 +197,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
 
@@ -237,8 +210,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,8 +224,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 StatusPage && npm install && npm run compile && npm run dep-check
@@ -269,7 +238,5 @@ 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

Accounts/Dockerfile.tpl

@@ -38,12 +38,6 @@ COPY ./Common /usr/src/Common
 
 
 
-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
 
 
 

AdminDashboard/Dockerfile.tpl

@@ -37,12 +37,6 @@ COPY ./Common /usr/src/Common
 
 
 
-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
 
 
 

App/Dockerfile.tpl

@@ -38,14 +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/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

App/package.json

@@ -22,7 +22,6 @@
     "CommonServer": "file:../CommonServer",
     "ejs": "^3.1.9",
     "handlebars": "^4.7.8",
-    "Model": "file:../Model",
     "nodemailer": "^6.9.7",
     "ts-node": "^10.9.1",
     "twilio": "^4.20.0",

Common/Models/AnalyticsModels/Index.ts

@@ -2,7 +2,7 @@ import Log from "./Log";
 import Metric from "./Metric";
 import MonitorMetricsByMinute from "./MonitorMetricsByMinute";
 import Span from "./Span";
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import TelemetryAttribute from "./TelemetryAttribute";
 
 const AnalyticsModels: Array<typeof AnalyticsBaseModel> = [

Common/Models/AnalyticsModels/Log.ts

@@ -1,4 +1,4 @@
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";

Common/Models/AnalyticsModels/Metric.ts

@@ -1,4 +1,4 @@
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";

Common/Models/AnalyticsModels/MonitorMetricsByMinute.ts

@@ -1,4 +1,4 @@
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";

Common/Models/AnalyticsModels/NestedModels/KeyValueNestedModel.ts

@@ -1,4 +1,4 @@
-import NestedModel from "../../../AnalyticsModels/NestedModel";
+import NestedModel from "../../BaseModels/AnalyticsBaseModel/NestedModel";
 import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
 

Common/Models/AnalyticsModels/Span.ts

@@ -1,4 +1,4 @@
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";

Common/Models/AnalyticsModels/TelemetryAttribute.ts

@@ -1,4 +1,4 @@
-import AnalyticsBaseModel from "../../AnalyticsModels/BaseModel";
+import AnalyticsBaseModel from "../BaseModels/AnalyticsBaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";

Common/Models/BaseModels/AnalyticsBaseModel/BaseModel.ts

@@ -1,23 +1,23 @@
-import Route from "../Types/API/Route";
-import AnalyticsTableEngine from "../Types/AnalyticsDatabase/AnalyticsTableEngine";
-import AnalyticsTableColumn from "../Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "../Types/AnalyticsDatabase/TableColumnType";
+import Route from "../../../Types/API/Route";
+import AnalyticsTableEngine from "../../../Types/AnalyticsDatabase/AnalyticsTableEngine";
+import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
+import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
 import {
   ColumnAccessControl,
   TableAccessControl,
-} from "../Types/BaseDatabase/AccessControl";
-import ColumnBillingAccessControl from "../Types/BaseDatabase/ColumnBillingAccessControl";
-import EnableWorkflowOn from "../Types/BaseDatabase/EnableWorkflowOn";
-import ModelPermission from "../Types/BaseDatabase/ModelPermission";
-import TableBillingAccessControl from "../Types/BaseDatabase/TableBillingAccessControl";
-import { PlanType } from "../Types/Billing/SubscriptionPlan";
-import Dictionary from "../Types/Dictionary";
-import BadDataException from "../Types/Exception/BadDataException";
-import { JSONValue } from "../Types/JSON";
-import ObjectID from "../Types/ObjectID";
-import Permission, { UserTenantAccessPermission } from "../Types/Permission";
-import Text from "../Types/Text";
-import { EnableRealtimeEventsOn } from "../Utils/Realtime";
+} from "../../../Types/BaseDatabase/AccessControl";
+import ColumnBillingAccessControl from "../../../Types/BaseDatabase/ColumnBillingAccessControl";
+import EnableWorkflowOn from "../../../Types/BaseDatabase/EnableWorkflowOn";
+import ModelPermission from "../../../Types/BaseDatabase/ModelPermission";
+import TableBillingAccessControl from "../../../Types/BaseDatabase/TableBillingAccessControl";
+import { PlanType } from "../../../Types/Billing/SubscriptionPlan";
+import Dictionary from "../../../Types/Dictionary";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import { JSONValue } from "../../../Types/JSON";
+import ObjectID from "../../../Types/ObjectID";
+import Permission, { UserTenantAccessPermission } from "../../../Types/Permission";
+import Text from "../../../Types/Text";
+import { EnableRealtimeEventsOn } from "../../../Utils/Realtime";
 import CommonModel from "./CommonModel";
 
 export type AnalyticsBaseModelType = { new (): AnalyticsBaseModel };

Common/Models/BaseModels/AnalyticsBaseModel/CommonModel.ts

@@ -1,19 +1,19 @@
 // This model will be extended by BaseModel and Nested Mdoel
-import AnalyticsTableColumn from "../Types/AnalyticsDatabase/TableColumn";
-import TableColumnType from "../Types/AnalyticsDatabase/TableColumnType";
-import GreaterThan from "../Types/BaseDatabase/GreaterThan";
-import GreaterThanOrEqual from "../Types/BaseDatabase/GreaterThanOrEqual";
-import InBetween from "../Types/BaseDatabase/InBetween";
-import Includes from "../Types/BaseDatabase/Includes";
-import LessThan from "../Types/BaseDatabase/LessThan";
-import LessThanOrEqual from "../Types/BaseDatabase/LessThanOrEqual";
-import NotEqual from "../Types/BaseDatabase/NotEqual";
-import Search from "../Types/BaseDatabase/Search";
-import OneUptimeDate from "../Types/Date";
-import BadDataException from "../Types/Exception/BadDataException";
-import { JSONArray, JSONObject, JSONValue } from "../Types/JSON";
-import JSONFunctions from "../Types/JSONFunctions";
-import ObjectID from "../Types/ObjectID";
+import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
+import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
+import GreaterThan from "../../../Types/BaseDatabase/GreaterThan";
+import GreaterThanOrEqual from "../../../Types/BaseDatabase/GreaterThanOrEqual";
+import InBetween from "../../../Types/BaseDatabase/InBetween";
+import Includes from "../../../Types/BaseDatabase/Includes";
+import LessThan from "../../../Types/BaseDatabase/LessThan";
+import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
+import Search from "../../../Types/BaseDatabase/Search";
+import OneUptimeDate from "../../../Types/Date";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import { JSONArray, JSONObject, JSONValue } from "../../../Types/JSON";
+import JSONFunctions from "../../../Types/JSONFunctions";
+import ObjectID from "../../../Types/ObjectID";
 
 export type RecordValue =
   | ObjectID

Common/Models/BaseModels/AnalyticsBaseModel/NestedModel.ts

@@ -1,4 +1,4 @@
-import AnalyticsTableColumn from "../Types/AnalyticsDatabase/TableColumn";
+import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
 import CommonModel from "./CommonModel";
 
 export default class NestedModel extends CommonModel {

Common/Models/BaseModels/BaseModel/AccessControlModel.ts

@@ -1,4 +1,4 @@
-import ObjectID from "../Types/ObjectID";
+import ObjectID from "../../../Types/ObjectID";
 import BaseModel from "./BaseModel";
 
 export default class AccessControlModel extends BaseModel {

Common/Models/BaseModels/BaseModel/BaseModel.ts

@@ -1,30 +1,30 @@
-import Route from "../Types/API/Route";
-import { ColumnAccessControl } from "../Types/BaseDatabase/AccessControl";
-import ColumnBillingAccessControl from "../Types/BaseDatabase/ColumnBillingAccessControl";
-import EnableWorkflowOn from "../Types/BaseDatabase/EnableWorkflowOn";
-import ModelPermission from "../Types/BaseDatabase/ModelPermission";
-import { PlanType } from "../Types/Billing/SubscriptionPlan";
-import { getColumnAccessControlForAllColumns } from "../Types/Database/AccessControl/ColumnAccessControl";
-import { getColumnBillingAccessControlForAllColumns } from "../Types/Database/AccessControl/ColumnBillingAccessControl";
-import Columns from "../Types/Database/Columns";
+import Route from "../../../Types/API/Route";
+import { ColumnAccessControl } from "../../../Types/BaseDatabase/AccessControl";
+import ColumnBillingAccessControl from "../../../Types/BaseDatabase/ColumnBillingAccessControl";
+import EnableWorkflowOn from "../../../Types/BaseDatabase/EnableWorkflowOn";
+import ModelPermission from "../../../Types/BaseDatabase/ModelPermission";
+import { PlanType } from "../../../Types/Billing/SubscriptionPlan";
+import { getColumnAccessControlForAllColumns } from "../../../Types/Database/AccessControl/ColumnAccessControl";
+import { getColumnBillingAccessControlForAllColumns } from "../../../Types/Database/AccessControl/ColumnBillingAccessControl";
+import Columns from "../../../Types/Database/Columns";
 import TableColumn, {
   TableColumnMetadata,
   getTableColumn,
   getTableColumns,
-} from "../Types/Database/TableColumn";
-import TableColumnType from "../Types/Database/TableColumnType";
-import Dictionary from "../Types/Dictionary";
-import Email from "../Types/Email";
-import BadDataException from "../Types/Exception/BadDataException";
-import HashedString from "../Types/HashedString";
-import IconProp from "../Types/Icon/IconProp";
-import { JSONArray, JSONObject, JSONValue } from "../Types/JSON";
-import JSONFunctions from "../Types/JSONFunctions";
-import ObjectID from "../Types/ObjectID";
-import Permission, { UserTenantAccessPermission } from "../Types/Permission";
-import Phone from "../Types/Phone";
-import PositiveNumber from "../Types/PositiveNumber";
-import Text from "../Types/Text";
+} from "../../../Types/Database/TableColumn";
+import TableColumnType from "../../../Types/Database/TableColumnType";
+import Dictionary from "../../../Types/Dictionary";
+import Email from "../../../Types/Email";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import HashedString from "../../../Types/HashedString";
+import IconProp from "../../../Types/Icon/IconProp";
+import { JSONArray, JSONObject, JSONValue } from "../../../Types/JSON";
+import JSONFunctions from "../../../Types/JSONFunctions";
+import ObjectID from "../../../Types/ObjectID";
+import Permission, { UserTenantAccessPermission } from "../../../Types/Permission";
+import Phone from "../../../Types/Phone";
+import PositiveNumber from "../../../Types/PositiveNumber";
+import Text from "../../../Types/Text";
 import {
   BaseEntity,
   CreateDateColumn,

Common/Models/BaseModels/BaseModel/FileModel.ts

@@ -1,12 +1,12 @@
-import ColumnAccessControl from "../Types/Database/AccessControl/ColumnAccessControl";
-import ColumnLength from "../Types/Database/ColumnLength";
-import ColumnType from "../Types/Database/ColumnType";
-import SlugifyColumn from "../Types/Database/SlugifyColumn";
-import TableColumn from "../Types/Database/TableColumn";
-import TableColumnType from "../Types/Database/TableColumnType";
-import MimeType from "../Types/File/MimeType";
-import ObjectID from "../Types/ObjectID";
-import Permission from "../Types/Permission";
+import ColumnAccessControl from "../../../Types/Database/AccessControl/ColumnAccessControl";
+import ColumnLength from "../../../Types/Database/ColumnLength";
+import ColumnType from "../../../Types/Database/ColumnType";
+import SlugifyColumn from "../../../Types/Database/SlugifyColumn";
+import TableColumn from "../../../Types/Database/TableColumn";
+import TableColumnType from "../../../Types/Database/TableColumnType";
+import MimeType from "../../../Types/File/MimeType";
+import ObjectID from "../../../Types/ObjectID";
+import Permission from "../../../Types/Permission";
 import BaseModel from "./BaseModel";
 import { Column } from "typeorm";
 

Common/Models/BaseModels/BaseModel/GlobalConfig.ts

@@ -1,4 +1,4 @@
-import ObjectID from "../Types/ObjectID";
+import ObjectID from "../../../Types/ObjectID";
 import BaseModel from "./BaseModel";
 
 export default class GlobalConfig extends BaseModel {

Common/Models/BaseModels/BaseModel/TenantModel.ts

@@ -1,4 +1,4 @@
-import ObjectID from "../Types/ObjectID";
+import ObjectID from "../../../Types/ObjectID";
 import BaseModel from "./BaseModel";
 
 export default class TenantModel extends BaseModel {

Common/Models/BaseModels/BaseModel/UserModel.ts

@@ -1,4 +1,4 @@
-import ObjectID from "../Types/ObjectID";
+import ObjectID from "../../../Types/ObjectID";
 import BaseModel from "./BaseModel";
 
 export default class UserModel extends BaseModel {

Common/Models/Models/AcmeCertificate.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";

Common/Models/Models/AcmeChallenge.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";

Common/Models/Models/ApiKey.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ApiKeyPermission.ts

@@ -2,7 +2,7 @@ import ApiKey from "./ApiKey";
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/BillingInvoice.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import URL from "../../Types/API/URL";
 import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";

Common/Models/Models/BillingPaymentMethod.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import AllowAccessIfSubscriptionIsUnpaid from "../../Types/Database/AccessControl/AllowAccessIfSubscriptionIsUnpaid";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/CallLog.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import CallStatus from "../../Types/Call/CallStatus";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/CopilotAction.ts

@@ -3,7 +3,7 @@ import Project from "./Project";
 import ServiceCatalog from "./ServiceCatalog";
 import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import CopilotActionStatus from "../../Types/Copilot/CopilotActionStatus";
 import CopilotActionType from "../../Types/Copilot/CopilotActionType";

Common/Models/Models/CopilotCodeRepository.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import CodeRepositoryType from "../../Types/CodeRepository/CodeRepositoryType";

Common/Models/Models/CopilotPullRequest.ts

@@ -3,7 +3,7 @@ import Project from "./Project";
 import ServiceCatalog from "./ServiceCatalog";
 import ServiceCopilotCodeRepository from "./ServiceCopilotCodeRepository";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import PullRequestState from "../../Types/CodeRepository/PullRequestState";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/DataMigration.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";

Common/Models/Models/Domain.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/EmailLog.ts

@@ -1,7 +1,7 @@
 import Project from "./Project";
 import ProjectSmtpConfig from "./ProjectSmtpConfig";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/EmailVerificationToken.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/File.ts

@@ -1,4 +1,4 @@
-import FileModel from "../../Models/FileModel";
+import FileModel from "../BaseModels/BaseModel/FileModel";
 import Route from "../../Types/API/Route";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";

Common/Models/Models/GlobalConfig.ts

@@ -1,4 +1,4 @@
-import GlobalConfigModel from "../../Models/GlobalConfig";
+import GlobalConfigModel from "../../Models/BaseModels/BaseModel/GlobalConfig";
 import Hostname from "../../Types/API/Hostname";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/GreenlockCertificate.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";

Common/Models/Models/GreenlockChallenge.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";

Common/Models/Models/Incident.ts

@@ -7,7 +7,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Probe from "./Probe";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentCustomField.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";

Common/Models/Models/IncidentInternalNote.ts

@@ -1,7 +1,7 @@
 import Incident from "./Incident";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentNoteTemplate.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentOwnerTeam.ts

@@ -2,7 +2,7 @@ import Incident from "./Incident";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentOwnerUser.ts

@@ -1,7 +1,7 @@
 import Incident from "./Incident";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentPublicNote.ts

@@ -1,7 +1,7 @@
 import Incident from "./Incident";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentSeverity.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/IncidentState.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/IncidentStateTimeline.ts

@@ -2,7 +2,7 @@ import Incident from "./Incident";
 import IncidentState from "./IncidentState";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentTemplate.ts

@@ -6,7 +6,7 @@ import MonitorStatus from "./MonitorStatus";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentTemplateOwnerTeam.ts

@@ -2,7 +2,7 @@ import IncidentTemplate from "./IncidentTemplate";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/IncidentTemplateOwnerUser.ts

@@ -1,7 +1,7 @@
 import IncidentTemplate from "./IncidentTemplate";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/Label.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import AccessControlModel from "../../Models/AccessControlModel";
+import AccessControlModel from "../BaseModels/BaseModel/AccessControlModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/Monitor.ts

@@ -2,7 +2,7 @@ import Label from "./Label";
 import MonitorStatus from "./MonitorStatus";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/MonitorCustomField.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";

Common/Models/Models/MonitorGroup.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorGroupOwnerTeam.ts

@@ -2,7 +2,7 @@ import MonitorGroup from "./MonitorGroup";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorGroupOwnerUser.ts

@@ -1,7 +1,7 @@
 import MonitorGroup from "./MonitorGroup";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorGroupResource.ts

@@ -2,7 +2,7 @@ import Monitor from "./Monitor";
 import MonitorGroup from "./MonitorGroup";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/MonitorOwnerTeam.ts

@@ -2,7 +2,7 @@ import Monitor from "./Monitor";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorOwnerUser.ts

@@ -1,7 +1,7 @@
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorProbe.ts

@@ -2,7 +2,7 @@ import Monitor from "./Monitor";
 import Probe from "./Probe";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/MonitorSecret.ts

@@ -1,7 +1,7 @@
 import Monitor from "./Monitor";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/MonitorStatus.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/MonitorStatusTimeline.ts

@@ -2,7 +2,7 @@ import Monitor from "./Monitor";
 import MonitorStatus from "./MonitorStatus";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicy.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicyCustomField.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";

Common/Models/Models/OnCallDutyPolicyEscalationRule.ts

@@ -1,7 +1,7 @@
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicyEscalationRuleSchedule.ts

@@ -3,7 +3,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicyEscalationRuleTeam.ts

@@ -3,7 +3,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicyEscalationRuleUser.ts

@@ -2,7 +2,7 @@ import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/OnCallDutyPolicyExecutionLog.ts

@@ -4,7 +4,7 @@ import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/OnCallDutyPolicyExecutionLogTimeline.ts

@@ -6,7 +6,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/OnCallDutyPolicySchedule.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/OnCallDutyPolicyScheduleLayer.ts

@@ -1,7 +1,7 @@
 import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/OnCallDutyPolicyScheduleLayerUser.ts

@@ -2,7 +2,7 @@ import OnCallDutyPolicySchedule from "./OnCallDutyPolicySchedule";
 import OnCallDutyPolicyScheduleLayer from "./OnCallDutyPolicyScheduleLayer";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/Probe.ts

@@ -1,7 +1,7 @@
 import File from "./File";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ProbeOwnerTeam.ts

@@ -2,7 +2,7 @@ import Probe from "./Probe";
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ProbeOwnerUser.ts

@@ -1,7 +1,7 @@
 import Probe from "./Probe";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/Project.ts

@@ -1,7 +1,7 @@
 import Reseller from "./Reseller";
 import ResellerPlan from "./ResellerPlan";
 import User from "./User";
-import TenantModel from "../../Models/TenantModel";
+import TenantModel from "../../Models/BaseModels/BaseModel/TenantModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import SubscriptionStatus from "../../Types/Billing/SubscriptionStatus";

Common/Models/Models/ProjectCallSMSConfig.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ProjectSmtpConfig.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Hostname from "../../Types/API/Hostname";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";

Common/Models/Models/ProjectSso.ts

@@ -1,7 +1,7 @@
 import Project from "./Project";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import URL from "../../Types/API/URL";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";

Common/Models/Models/PromoCode.ts

@@ -2,7 +2,7 @@ import Project from "./Project";
 import Reseller from "./Reseller";
 import ResellerPlan from "./ResellerPlan";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/Reseller.ts

@@ -1,5 +1,5 @@
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import URL from "../../Types/API/URL";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ResellerPlan.ts

@@ -1,6 +1,6 @@
 import Reseller from "./Reseller";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ScheduledMaintenance.ts

@@ -5,7 +5,7 @@ import Project from "./Project";
 import ScheduledMaintenanceState from "./ScheduledMaintenanceState";
 import StatusPage from "./StatusPage";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenanceCustomField.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import CustomFieldType from "../../Types/CustomField/CustomFieldType";

Common/Models/Models/ScheduledMaintenanceInternalNote.ts

@@ -1,7 +1,7 @@
 import Project from "./Project";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenanceNoteTemplate.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenanceOwnerTeam.ts

@@ -2,7 +2,7 @@ import Project from "./Project";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenanceOwnerUser.ts

@@ -1,7 +1,7 @@
 import Project from "./Project";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenancePublicNote.ts

@@ -1,7 +1,7 @@
 import Project from "./Project";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ScheduledMaintenanceState.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/ScheduledMaintenanceStateTimeline.ts

@@ -2,7 +2,7 @@ import Project from "./Project";
 import ScheduledMaintenance from "./ScheduledMaintenance";
 import ScheduledMaintenanceState from "./ScheduledMaintenanceState";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";

Common/Models/Models/ServiceCatalog.ts

@@ -1,7 +1,7 @@
 import Label from "./Label";
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import Color from "../../Types/Color";

Common/Models/Models/ServiceCatalogDependency.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ServiceCatalogMonitor.ts

@@ -1,6 +1,6 @@
 import Project from "./Project";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";

Common/Models/Models/ServiceCatalogOwnerTeam.ts

@@ -2,7 +2,7 @@ import Project from "./Project";
 import ServiceCatalog from "./ServiceCatalog";
 import Team from "./Team";
 import User from "./User";
-import BaseModel from "../../Models/BaseModel";
+import BaseModel from "../BaseModels/BaseModel/BaseModel";
 import Route from "../../Types/API/Route";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";