diff --git a/wowup-electron/app-menu.ts b/wowup-electron/app-menu.ts
index 2dda8e0d..d4a34ff0 100644
--- a/wowup-electron/app-menu.ts
+++ b/wowup-electron/app-menu.ts
@@ -5,7 +5,7 @@ import {
   IPC_MENU_ZOOM_OUT_CHANNEL,
   IPC_MENU_ZOOM_RESET_CHANNEL,
 } from "./src/common/constants";
-import { MenuConfig } from "./src/common/wowup/menu-config";
+import { MenuConfig } from "./src/common/wowup/models";
 
 function onMenuZoomIn(win: BrowserWindow) {
   win?.webContents.send(IPC_MENU_ZOOM_IN_CHANNEL);
diff --git a/wowup-electron/ipc-events.ts b/wowup-electron/ipc-events.ts
index b203d738..2bf19153 100644
--- a/wowup-electron/ipc-events.ts
+++ b/wowup-electron/ipc-events.ts
@@ -58,10 +58,8 @@ import { DownloadStatusType } from "./src/common/models/download-status-type";
 import { FsDirent, FsStats } from "./src/common/models/ipc-events";
 import { UnzipRequest } from "./src/common/models/unzip-request";
 import { RendererChannels } from "./src/common/wowup";
-import { MenuConfig } from "./src/common/wowup/menu-config";
-import { SystemTrayConfig } from "./src/common/wowup/system-tray-config";
+import { MenuConfig, SystemTrayConfig, WowUpScanResult } from "./src/common/wowup/models";
 import { WowUpFolderScanner } from "./src/common/wowup/wowup-folder-scanner";
-import { WowUpScanResult } from "./src/common/wowup/wowup-scan-result";
 import { Addon } from "./src/common/entities/addon";
 import { createTray, restoreWindow } from "./system-tray";
 import { addonStore } from "./stores";
diff --git a/wowup-electron/main.ts b/wowup-electron/main.ts
index 9b62d108..4ea90cac 100644
--- a/wowup-electron/main.ts
+++ b/wowup-electron/main.ts
@@ -28,7 +28,7 @@ import {
   WINDOW_MIN_WIDTH,
   WOWUP_LOGO_FILENAME,
 } from "./src/common/constants";
-import { AppOptions } from "./src/common/wowup/app-options";
+import { AppOptions } from "./src/common/wowup/models";
 import { windowStateManager } from "./window-state";
 import { createAppMenu } from "./app-menu";
 import { MainChannels } from "./src/common/wowup";
diff --git a/wowup-electron/src/app/addon-providers/addon-provider.ts b/wowup-electron/src/app/addon-providers/addon-provider.ts
index 298e4f11..f2981f7c 100644
--- a/wowup-electron/src/app/addon-providers/addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/addon-provider.ts
@@ -3,7 +3,7 @@ import { WowInstallation } from "../models/wowup/wow-installation";
 import { Observable, of } from "rxjs";
 
 import { Addon } from "../../common/entities/addon";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { AddonFolder } from "../models/wowup/addon-folder";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
 
diff --git a/wowup-electron/src/app/addon-providers/curse-addon-provider.ts b/wowup-electron/src/app/addon-providers/curse-addon-provider.ts
index 4a710748..48521a7f 100644
--- a/wowup-electron/src/app/addon-providers/curse-addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/curse-addon-provider.ts
@@ -12,8 +12,7 @@ import {
 import { CurseFolderScanResult } from "../../common/curse/curse-folder-scan-result";
 import { Addon } from "../../common/entities/addon";
 import { WowClientType } from "../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
-import { AddonDependencyType } from "../../common/wowup/addon-dependency-type";
+import { AddonChannelType, AddonDependencyType } from "../../common/wowup/models";
 import { AppConfig } from "../../environments/environment";
 import { AppCurseScanResult } from "../models/curse/app-curse-scan-result";
 import {
diff --git a/wowup-electron/src/app/addon-providers/github-addon-provider.ts b/wowup-electron/src/app/addon-providers/github-addon-provider.ts
index a1ef88fb..f1fa7d6f 100644
--- a/wowup-electron/src/app/addon-providers/github-addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/github-addon-provider.ts
@@ -18,7 +18,7 @@ import { GitHubAsset } from "../models/github/github-asset";
 import { GitHubRelease } from "../models/github/github-release";
 import { GitHubRepository } from "../models/github/github-repository";
 import { WowClientType } from "../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
 import { AddonSearchResultFile } from "../models/wowup/addon-search-result-file";
 import { AddonProvider, GetAllResult } from "./addon-provider";
diff --git a/wowup-electron/src/app/addon-providers/raiderio-provider.ts b/wowup-electron/src/app/addon-providers/raiderio-provider.ts
index ee36f1cd..db30d1dc 100644
--- a/wowup-electron/src/app/addon-providers/raiderio-provider.ts
+++ b/wowup-electron/src/app/addon-providers/raiderio-provider.ts
@@ -3,7 +3,7 @@ import * as _ from "lodash";
 import { v4 as uuidv4 } from "uuid";
 
 import { ADDON_PROVIDER_RAIDERIO } from "../../common/constants";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { AddonFolder } from "../models/wowup/addon-folder";
 import { getEnumName } from "../utils/enum.utils";
 import { AddonProvider } from "./addon-provider";
diff --git a/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts b/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts
index 7a036de0..461edaa0 100644
--- a/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/tukui-addon-provider.ts
@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from "uuid";
 
 import { ADDON_PROVIDER_TUKUI } from "../../common/constants";
 import { WowClientType } from "../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { TukUiAddon } from "../models/tukui/tukui-addon";
 import { AddonFolder } from "../models/wowup/addon-folder";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
diff --git a/wowup-electron/src/app/addon-providers/wow-interface-addon-provider.ts b/wowup-electron/src/app/addon-providers/wow-interface-addon-provider.ts
index 363e5b2f..3264ce29 100644
--- a/wowup-electron/src/app/addon-providers/wow-interface-addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/wow-interface-addon-provider.ts
@@ -7,7 +7,7 @@ import { HttpErrorResponse } from "@angular/common/http";
 
 import { ADDON_PROVIDER_WOWINTERFACE } from "../../common/constants";
 import { Addon } from "../../common/entities/addon";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { SourceRemovedAddonError } from "../errors";
 import { AddonDetailsResponse } from "../models/wow-interface/addon-details-response";
 import { AddonFolder } from "../models/wowup/addon-folder";
diff --git a/wowup-electron/src/app/addon-providers/wowup-addon-provider.ts b/wowup-electron/src/app/addon-providers/wowup-addon-provider.ts
index 0f738dda..a476789a 100644
--- a/wowup-electron/src/app/addon-providers/wowup-addon-provider.ts
+++ b/wowup-electron/src/app/addon-providers/wowup-addon-provider.ts
@@ -6,8 +6,7 @@ import { v4 as uuidv4 } from "uuid";
 import { ADDON_PROVIDER_HUB, IPC_WOWUP_GET_SCAN_RESULTS } from "../../common/constants";
 import { Addon } from "../../common/entities/addon";
 import { WowClientType } from "../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
-import { WowUpScanResult } from "../../common/wowup/wowup-scan-result";
+import { AddonChannelType, WowUpScanResult } from "../../common/wowup/models";
 import { AppConfig } from "../../environments/environment";
 import { SourceRemovedAddonError } from "../errors";
 import { WowUpAddonReleaseRepresentation, WowUpAddonRepresentation } from "../models/wowup-api/addon-representations";
diff --git a/wowup-electron/src/app/addon-providers/zip-provider.ts b/wowup-electron/src/app/addon-providers/zip-provider.ts
index d2b5d65a..19891fa9 100644
--- a/wowup-electron/src/app/addon-providers/zip-provider.ts
+++ b/wowup-electron/src/app/addon-providers/zip-provider.ts
@@ -7,7 +7,7 @@ import { HttpClient } from "@angular/common/http";
 
 import { ADDON_PROVIDER_ZIP } from "../../common/constants";
 import { Addon } from "../../common/entities/addon";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
 import { AddonSearchResultFile } from "../models/wowup/addon-search-result-file";
 import { Toc } from "../models/wowup/toc";
diff --git a/wowup-electron/src/app/app.component.ts b/wowup-electron/src/app/app.component.ts
index 67ba3ffc..1d378cb7 100644
--- a/wowup-electron/src/app/app.component.ts
+++ b/wowup-electron/src/app/app.component.ts
@@ -31,8 +31,7 @@ import {
   ZOOM_FACTOR_KEY,
   WOWUP_LOGO_FILENAME,
 } from "../common/constants";
-import { SystemTrayConfig } from "../common/wowup/system-tray-config";
-import { MenuConfig } from "../common/wowup/menu-config";
+import { MenuConfig, SystemTrayConfig } from "../common/wowup/models";
 import { TelemetryDialogComponent } from "./components/telemetry-dialog/telemetry-dialog.component";
 import { ElectronService } from "./services";
 import { AddonService } from "./services/addons/addon.service";
diff --git a/wowup-electron/src/app/business-objects/addon-view-model.ts b/wowup-electron/src/app/business-objects/addon-view-model.ts
index 5b71f529..d58bf9f4 100644
--- a/wowup-electron/src/app/business-objects/addon-view-model.ts
+++ b/wowup-electron/src/app/business-objects/addon-view-model.ts
@@ -1,12 +1,10 @@
 import * as _ from "lodash";
-import { AddonDependencyType } from "../../common/wowup/addon-dependency-type";
+import { AddonChannelType, AddonDependency, AddonDependencyType } from "../../common/wowup/models";
 import { Addon } from "../../common/entities/addon";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
 import { AddonInstallState } from "../models/wowup/addon-install-state";
 import { AddonStatusSortOrder } from "../models/wowup/addon-status-sort-order";
 import * as AddonUtils from "../utils/addon.utils";
 import { ADDON_PROVIDER_UNKNOWN } from "../../common/constants";
-import { AddonDependency } from "../../common/wowup/addon-dependency";
 
 export class AddonViewModel {
   public addon: Addon;
diff --git a/wowup-electron/src/app/business-objects/get-addon-list-item.ts b/wowup-electron/src/app/business-objects/get-addon-list-item.ts
index ba77ad31..78f6c3d3 100644
--- a/wowup-electron/src/app/business-objects/get-addon-list-item.ts
+++ b/wowup-electron/src/app/business-objects/get-addon-list-item.ts
@@ -1,6 +1,6 @@
 import * as _ from "lodash";
 
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import { AddonInstallState } from "../models/wowup/addon-install-state";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
 import * as SearchResults from "../utils/search-result.utils";
diff --git a/wowup-electron/src/app/components/addon-detail/addon-detail.component.ts b/wowup-electron/src/app/components/addon-detail/addon-detail.component.ts
index a512c8e2..df21c7c8 100644
--- a/wowup-electron/src/app/components/addon-detail/addon-detail.component.ts
+++ b/wowup-electron/src/app/components/addon-detail/addon-detail.component.ts
@@ -20,9 +20,7 @@ import { TranslateService } from "@ngx-translate/core";
 
 import { ADDON_PROVIDER_GITHUB, ADDON_PROVIDER_UNKNOWN } from "../../../common/constants";
 import { AddonFundingLink } from "../../../common/entities/addon";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
-import { AddonDependency } from "../../../common/wowup/addon-dependency";
-import { AddonDependencyType } from "../../../common/wowup/addon-dependency-type";
+import { AddonChannelType, AddonDependency, AddonDependencyType } from "../../../common/wowup/models";
 import { AddonViewModel } from "../../business-objects/addon-view-model";
 import { AddonSearchResult } from "../../models/wowup/addon-search-result";
 import { AddonSearchResultDependency } from "../../models/wowup/addon-search-result-dependency";
diff --git a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
index 1fc60240..037ff7a1 100644
--- a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
+++ b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
@@ -3,7 +3,7 @@ import { MatDialog } from "@angular/material/dialog";
 import { TranslateService } from "@ngx-translate/core";
 
 import { AddonViewModel } from "../../business-objects/addon-view-model";
-import { AddonWarningType } from "../../../common/wowup/addon-warning-type";
+import { AddonWarningType } from "../../../common/wowup/models";
 import { AlertDialogComponent } from "../alert-dialog/alert-dialog.component";
 
 @Component({
diff --git a/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.ts b/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.ts
index 85b64fe7..671b4ead 100644
--- a/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.ts
+++ b/wowup-electron/src/app/components/my-addons-addon-cell/my-addons-addon-cell.component.ts
@@ -2,8 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 
 import { AddonViewModel } from "../../business-objects/addon-view-model";
-import { AddonDependencyType } from "../../../common/wowup/addon-dependency-type";
-import { AddonWarningType } from "../../../common/wowup/addon-warning-type";
+import { AddonDependencyType, AddonWarningType } from "../../../common/wowup/models";
 import * as AddonUtils from "../../utils/addon.utils";
 import { capitalizeString } from "../../utils/string.utils";
 
diff --git a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.ts b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.ts
index 157bd7b5..73e7c922 100644
--- a/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.ts
+++ b/wowup-electron/src/app/components/potential-addon-table-column/potential-addon-table-column.component.ts
@@ -3,8 +3,7 @@ import * as _ from "lodash";
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from "@angular/core";
 
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
-import { AddonDependencyType } from "../../../common/wowup/addon-dependency-type";
+import { AddonChannelType, AddonDependencyType } from "../../../common/wowup/models";
 import { GetAddonListItem } from "../../business-objects/get-addon-list-item";
 import { AddonSearchResult } from "../../models/wowup/addon-search-result";
 import { AddonSearchResultDependency } from "../../models/wowup/addon-search-result-dependency";
diff --git a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts
index e94f369f..7def0164 100644
--- a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts
+++ b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts
@@ -9,7 +9,7 @@ import { MatSlideToggleChange } from "@angular/material/slide-toggle";
 import { TranslateService } from "@ngx-translate/core";
 
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 import { WowInstallation } from "../../models/wowup/wow-installation";
 import { WarcraftInstallationService } from "../../services/warcraft/warcraft-installation.service";
 import { getEnumList, getEnumName } from "../../utils/enum.utils";
diff --git a/wowup-electron/src/app/models/wowup/addon-search-result-dependency.ts b/wowup-electron/src/app/models/wowup/addon-search-result-dependency.ts
index 79b48078..51b68602 100644
--- a/wowup-electron/src/app/models/wowup/addon-search-result-dependency.ts
+++ b/wowup-electron/src/app/models/wowup/addon-search-result-dependency.ts
@@ -1,4 +1,4 @@
-import { AddonDependencyType } from "../../../common/wowup/addon-dependency-type";
+import { AddonDependencyType } from "../../../common/wowup/models";
 
 export interface AddonSearchResultDependency {
   externalAddonId: string;
diff --git a/wowup-electron/src/app/models/wowup/addon-search-result-file.ts b/wowup-electron/src/app/models/wowup/addon-search-result-file.ts
index 1484c686..ef51e09c 100644
--- a/wowup-electron/src/app/models/wowup/addon-search-result-file.ts
+++ b/wowup-electron/src/app/models/wowup/addon-search-result-file.ts
@@ -1,4 +1,4 @@
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 import { AddonSearchResultDependency } from "./addon-search-result-dependency";
 
 export interface AddonSearchResultFile {
diff --git a/wowup-electron/src/app/models/wowup/app-wowup-scan-result.ts b/wowup-electron/src/app/models/wowup/app-wowup-scan-result.ts
index babe4bd4..57f1b225 100644
--- a/wowup-electron/src/app/models/wowup/app-wowup-scan-result.ts
+++ b/wowup-electron/src/app/models/wowup/app-wowup-scan-result.ts
@@ -1,4 +1,4 @@
-import { WowUpScanResult } from "../../../common/wowup/wowup-scan-result";
+import { WowUpScanResult } from "../../../common/wowup/models";
 import { WowUpAddonRepresentation } from "../wowup-api/addon-representations";
 
 export interface AppWowUpScanResult extends WowUpScanResult {
diff --git a/wowup-electron/src/app/models/wowup/wow-installation.ts b/wowup-electron/src/app/models/wowup/wow-installation.ts
index 60b90c8e..3665d377 100644
--- a/wowup-electron/src/app/models/wowup/wow-installation.ts
+++ b/wowup-electron/src/app/models/wowup/wow-installation.ts
@@ -1,5 +1,5 @@
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 
 export interface WowInstallation {
   id: string;
diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.ts b/wowup-electron/src/app/pages/get-addons/get-addons.component.ts
index e5f053c6..b8660f11 100644
--- a/wowup-electron/src/app/pages/get-addons/get-addons.component.ts
+++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.ts
@@ -28,7 +28,7 @@ import { TranslateService } from "@ngx-translate/core";
 
 import { ADDON_PROVIDER_HUB } from "../../../common/constants";
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 import { GetAddonListItem } from "../../business-objects/get-addon-list-item";
 import { AddonDetailComponent, AddonDetailModel } from "../../components/addon-detail/addon-detail.component";
 import { InstallFromUrlDialogComponent } from "../../components/install-from-url-dialog/install-from-url-dialog.component";
diff --git a/wowup-electron/src/app/pipes/get-addon-list-item-file-prop.pipe.ts b/wowup-electron/src/app/pipes/get-addon-list-item-file-prop.pipe.ts
index 416b9bc5..b56c0807 100644
--- a/wowup-electron/src/app/pipes/get-addon-list-item-file-prop.pipe.ts
+++ b/wowup-electron/src/app/pipes/get-addon-list-item-file-prop.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from "@angular/core";
 import * as _ from "lodash";
 import { GetAddonListItem } from "../business-objects/get-addon-list-item";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../common/wowup/models";
 import * as SearchResults from "../utils/search-result.utils";
 
 @Pipe({
diff --git a/wowup-electron/src/app/services/addons/addon.service.ts b/wowup-electron/src/app/services/addons/addon.service.ts
index 09e4de77..88769697 100644
--- a/wowup-electron/src/app/services/addons/addon.service.ts
+++ b/wowup-electron/src/app/services/addons/addon.service.ts
@@ -20,10 +20,7 @@ import {
 } from "../../../common/constants";
 import { Addon, AddonExternalId } from "../../../common/entities/addon";
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
-import { AddonDependency } from "../../../common/wowup/addon-dependency";
-import { AddonDependencyType } from "../../../common/wowup/addon-dependency-type";
-import { AddonWarningType } from "../../../common/wowup/addon-warning-type";
+import { AddonChannelType, AddonDependency, AddonDependencyType, AddonWarningType } from "../../../common/wowup/models";
 import { AddonProvider, GetAllResult } from "../../addon-providers/addon-provider";
 import { CurseAddonProvider } from "../../addon-providers/curse-addon-provider";
 import { WowUpAddonProvider } from "../../addon-providers/wowup-addon-provider";
diff --git a/wowup-electron/src/app/services/electron/electron.service.ts b/wowup-electron/src/app/services/electron/electron.service.ts
index eb3fe259..f7ee3123 100644
--- a/wowup-electron/src/app/services/electron/electron.service.ts
+++ b/wowup-electron/src/app/services/electron/electron.service.ts
@@ -38,7 +38,7 @@ import { IpcRequest } from "../../../common/models/ipc-request";
 import { IpcResponse } from "../../../common/models/ipc-response";
 import { ValueRequest } from "../../../common/models/value-request";
 import { ValueResponse } from "../../../common/models/value-response";
-import { AppOptions } from "../../../common/wowup/app-options";
+import { AppOptions } from "../../../common/wowup/models";
 import { ZoomDirection, ZOOM_SCALE } from "../../utils/zoom.utils";
 import { PreferenceStorageService } from "../storage/preference-storage.service";
 import { MainChannels, RendererChannels } from "../../../common/wowup";
diff --git a/wowup-electron/src/app/services/warcraft/warcraft-installation.service.ts b/wowup-electron/src/app/services/warcraft/warcraft-installation.service.ts
index 9797529a..5b83dc7f 100644
--- a/wowup-electron/src/app/services/warcraft/warcraft-installation.service.ts
+++ b/wowup-electron/src/app/services/warcraft/warcraft-installation.service.ts
@@ -13,7 +13,7 @@ import {
   WOW_INSTALLATIONS_KEY,
 } from "../../../common/constants";
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 import { WowInstallation } from "../../models/wowup/wow-installation";
 import { getEnumName } from "../../utils/enum.utils";
 import { ElectronService } from "../electron/electron.service";
diff --git a/wowup-electron/src/app/services/wowup/wowup.service.ts b/wowup-electron/src/app/services/wowup/wowup.service.ts
index 14b54624..fc97af04 100644
--- a/wowup-electron/src/app/services/wowup/wowup.service.ts
+++ b/wowup-electron/src/app/services/wowup/wowup.service.ts
@@ -38,12 +38,10 @@ import {
   ADDON_MIGRATION_VERSION_KEY,
   IPC_GET_APP_VERSION,
   USE_SYMLINK_MODE_PREFERENCE_KEY,
-  WOW_INSTALLATIONS_KEY,
 } from "../../../common/constants";
 import { WowClientType } from "../../../common/warcraft/wow-client-type";
-import { AddonChannelType } from "../../../common/wowup/addon-channel-type";
+import { AddonChannelType } from "../../../common/wowup/models";
 import { PreferenceChange } from "../../models/wowup/preference-change";
-import { WowInstallation } from "../../models/wowup/wow-installation";
 import { SortOrder } from "../../models/wowup/sort-order";
 import { WowUpReleaseChannelType } from "../../models/wowup/wowup-release-channel-type";
 import { AddonProviderState } from "../../models/wowup/addon-provider-state";
@@ -51,8 +49,6 @@ import { getEnumList, getEnumName } from "../../utils/enum.utils";
 import { ElectronService } from "../electron/electron.service";
 import { FileService } from "../files/file.service";
 import { PreferenceStorageService } from "../storage/preference-storage.service";
-import { WarcraftService } from "../warcraft/warcraft.service";
-import { filter, map } from "rxjs/operators";
 
 @Injectable({
   providedIn: "root",
diff --git a/wowup-electron/src/app/utils/addon.utils.ts b/wowup-electron/src/app/utils/addon.utils.ts
index 425284ff..934c2d83 100644
--- a/wowup-electron/src/app/utils/addon.utils.ts
+++ b/wowup-electron/src/app/utils/addon.utils.ts
@@ -1,6 +1,6 @@
 import { orderBy, filter, map } from "lodash";
 import { Addon, AddonExternalId } from "../../common/entities/addon";
-import { AddonDependencyType } from "../../common/wowup/addon-dependency-type";
+import { AddonDependency, AddonDependencyType } from "../../common/wowup/models";
 
 export function getAllProviders(addon: Addon): AddonExternalId[] {
   return orderBy(addon.externalIds, ["providerName"], ["asc"]);
@@ -14,7 +14,7 @@ export function hasMultipleProviders(addon: Addon): boolean {
   return getProviders(addon).length > 0;
 }
 
-export function getAddonDependencies(addon: Addon, dependencyType: AddonDependencyType = undefined) {
+export function getAddonDependencies(addon: Addon, dependencyType: AddonDependencyType = undefined): AddonDependency[] {
   return dependencyType == undefined
     ? addon.dependencies
     : filter(addon.dependencies, (dep) => dep.type === dependencyType);
diff --git a/wowup-electron/src/app/utils/search-result.utils.ts b/wowup-electron/src/app/utils/search-result.utils.ts
index fc2227d4..ea5d5c77 100644
--- a/wowup-electron/src/app/utils/search-result.utils.ts
+++ b/wowup-electron/src/app/utils/search-result.utils.ts
@@ -1,7 +1,6 @@
-import { AddonDependencyType } from "../../common/wowup/addon-dependency-type";
+import { AddonChannelType, AddonDependencyType } from "../../common/wowup/models";
 import { AddonSearchResultDependency } from "../models/wowup/addon-search-result-dependency";
 import * as _ from "lodash";
-import { AddonChannelType } from "../../common/wowup/addon-channel-type";
 import { AddonSearchResult } from "../models/wowup/addon-search-result";
 import { AddonSearchResultFile } from "../models/wowup/addon-search-result-file";
 
diff --git a/wowup-electron/src/common/entities/addon.ts b/wowup-electron/src/common/entities/addon.ts
index 3fbf452b..eeebd0d4 100644
--- a/wowup-electron/src/common/entities/addon.ts
+++ b/wowup-electron/src/common/entities/addon.ts
@@ -1,9 +1,7 @@
 /// <reference path="../../typings.d.ts" />
 
 import { WowClientType } from "../warcraft/wow-client-type";
-import { AddonWarningType } from "../wowup/addon-warning-type";
-import { AddonChannelType } from "../wowup/addon-channel-type";
-import { AddonDependency } from "../wowup/addon-dependency";
+import { AddonChannelType, AddonDependency, AddonWarningType } from "../wowup/models";
 
 export interface AddonExternalId {
   providerName: string;
diff --git a/wowup-electron/src/common/wowup/addon-channel-type.ts b/wowup-electron/src/common/wowup/addon-channel-type.ts
deleted file mode 100644
index c9347197..00000000
--- a/wowup-electron/src/common/wowup/addon-channel-type.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum AddonChannelType {
-  Stable,
-  Beta,
-  Alpha,
-}
diff --git a/wowup-electron/src/common/wowup/addon-dependency-type.ts b/wowup-electron/src/common/wowup/addon-dependency-type.ts
deleted file mode 100644
index ae34bace..00000000
--- a/wowup-electron/src/common/wowup/addon-dependency-type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum AddonDependencyType {
-  Embedded = 1,
-  Required = 2,
-  Optional = 3,
-  Other = 4,
-}
diff --git a/wowup-electron/src/common/wowup/addon-dependency.ts b/wowup-electron/src/common/wowup/addon-dependency.ts
deleted file mode 100644
index e26bcfeb..00000000
--- a/wowup-electron/src/common/wowup/addon-dependency.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { AddonDependencyType } from "./addon-dependency-type";
-
-export interface AddonDependency {
-  externalAddonId: string;
-  type: AddonDependencyType;
-}
diff --git a/wowup-electron/src/common/wowup/addon-warning-type.ts b/wowup-electron/src/common/wowup/addon-warning-type.ts
deleted file mode 100644
index 96b38a9f..00000000
--- a/wowup-electron/src/common/wowup/addon-warning-type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum AddonWarningType {
-  MissingOnProvider = "missing-on-provider",
-}
diff --git a/wowup-electron/src/common/wowup/app-options.ts b/wowup-electron/src/common/wowup/app-options.ts
deleted file mode 100644
index d583b5f8..00000000
--- a/wowup-electron/src/common/wowup/app-options.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface AppOptions {
-  serve?: boolean;
-  hidden?: boolean;
-  quit?: boolean;
-}
diff --git a/wowup-electron/src/common/wowup/menu-config.ts b/wowup-electron/src/common/wowup/menu-config.ts
deleted file mode 100644
index f36c7888..00000000
--- a/wowup-electron/src/common/wowup/menu-config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface MenuConfig {
-  editLabel: string;
-  viewLabel: string;
-  zoomOutLabel: string;
-  zoomInLabel: string;
-  zoomResetLabel: string;
-  reloadLabel: string;
-  forceReloadLabel: string;
-  toggleDevToolsLabel: string;
-  toggleFullScreenLabel: string;
-  quitLabel: string;
-  undoLabel: string;
-  redoLabel: string;
-  cutLabel: string;
-  copyLabel: string;
-  pasteLabel: string;
-  selectAllLabel: string;
-  windowLabel: string;
-  windowCloseLabel: string;
-}
diff --git a/wowup-electron/src/common/wowup/models.ts b/wowup-electron/src/common/wowup/models.ts
new file mode 100644
index 00000000..b02ddf6c
--- /dev/null
+++ b/wowup-electron/src/common/wowup/models.ts
@@ -0,0 +1,62 @@
+export enum AddonChannelType {
+  Stable,
+  Beta,
+  Alpha,
+}
+
+export enum AddonDependencyType {
+  Embedded = 1,
+  Required = 2,
+  Optional = 3,
+  Other = 4,
+}
+
+export enum AddonWarningType {
+  MissingOnProvider = "missing-on-provider",
+}
+
+export interface AddonDependency {
+  externalAddonId: string;
+  type: AddonDependencyType;
+}
+
+export interface AppOptions {
+  serve?: boolean;
+  hidden?: boolean;
+  quit?: boolean;
+}
+
+export interface MenuConfig {
+  editLabel: string;
+  viewLabel: string;
+  zoomOutLabel: string;
+  zoomInLabel: string;
+  zoomResetLabel: string;
+  reloadLabel: string;
+  forceReloadLabel: string;
+  toggleDevToolsLabel: string;
+  toggleFullScreenLabel: string;
+  quitLabel: string;
+  undoLabel: string;
+  redoLabel: string;
+  cutLabel: string;
+  copyLabel: string;
+  pasteLabel: string;
+  selectAllLabel: string;
+  windowLabel: string;
+  windowCloseLabel: string;
+}
+
+export interface SystemTrayConfig {
+  showLabel: string;
+  quitLabel: string;
+  checkUpdateLabel: string;
+}
+
+export interface WowUpScanResult {
+  fileCount: number;
+  fileFingerprints: string[];
+  fingerprint: string;
+  folderName: string;
+  path: string;
+}
diff --git a/wowup-electron/src/common/wowup/system-tray-config.ts b/wowup-electron/src/common/wowup/system-tray-config.ts
deleted file mode 100644
index 7b59040b..00000000
--- a/wowup-electron/src/common/wowup/system-tray-config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface SystemTrayConfig {
-  showLabel: string;
-  quitLabel: string;
-  checkUpdateLabel: string;
-}
diff --git a/wowup-electron/src/common/wowup/wowup-folder-scanner.ts b/wowup-electron/src/common/wowup/wowup-folder-scanner.ts
index 95c3552d..9c1dad44 100644
--- a/wowup-electron/src/common/wowup/wowup-folder-scanner.ts
+++ b/wowup-electron/src/common/wowup/wowup-folder-scanner.ts
@@ -5,7 +5,7 @@ import * as path from "path";
 import * as pLimit from "p-limit";
 import * as log from "electron-log";
 import { readDirRecursive, readFile, readFileAsBuffer } from "../../../file.utils";
-import { WowUpScanResult } from "./wowup-scan-result";
+import { WowUpScanResult } from "./models";
 
 const INVALID_PATH_CHARS = [
   "|",
diff --git a/wowup-electron/src/common/wowup/wowup-get-scan-results-request.ts b/wowup-electron/src/common/wowup/wowup-get-scan-results-request.ts
deleted file mode 100644
index 89669ed5..00000000
--- a/wowup-electron/src/common/wowup/wowup-get-scan-results-request.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IpcRequest } from "../models/ipc-request";
-
-export interface WowUpGetScanResultsRequest extends IpcRequest {
-  filePaths: string[];
-}
diff --git a/wowup-electron/src/common/wowup/wowup-get-scan-results-response.ts b/wowup-electron/src/common/wowup/wowup-get-scan-results-response.ts
deleted file mode 100644
index a78fe61e..00000000
--- a/wowup-electron/src/common/wowup/wowup-get-scan-results-response.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { WowUpScanResult } from "./wowup-scan-result";
-
-export interface WowUpGetScanResultsResponse {
-  error?: Error;
-  scanResults: WowUpScanResult[];
-}
diff --git a/wowup-electron/src/common/wowup/wowup-scan-result.ts b/wowup-electron/src/common/wowup/wowup-scan-result.ts
deleted file mode 100644
index 48e8b6e3..00000000
--- a/wowup-electron/src/common/wowup/wowup-scan-result.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface WowUpScanResult {
-  fileCount: number;
-  fileFingerprints: string[];
-  fingerprint: string;
-  folderName: string;
-  path: string;
-}
diff --git a/wowup-electron/system-tray.ts b/wowup-electron/system-tray.ts
index b478f4c3..fb4a9ae4 100644
--- a/wowup-electron/system-tray.ts
+++ b/wowup-electron/system-tray.ts
@@ -4,7 +4,7 @@ import * as path from "path";
 
 import * as platform from "./platform";
 import { WOWUP_LOGO_FILENAME, WOWUP_LOGO_MAC_SYSTEM_TRAY } from "./src/common/constants";
-import { SystemTrayConfig } from "./src/common/wowup/system-tray-config";
+import { SystemTrayConfig } from "./src/common/wowup/models";
 
 let _trayRef: Tray;