diff --git a/src/pages/api/modules/downloads/index.ts b/src/pages/api/modules/downloads/index.ts
index 6d80db458..d49290039 100644
--- a/src/pages/api/modules/downloads/index.ts
+++ b/src/pages/api/modules/downloads/index.ts
@@ -13,8 +13,8 @@ import { NextApiRequest, NextApiResponse } from 'next';
 
 import { Client } from 'sabnzbd-api';
 
-import { NzbgetClient } from '../usenet/nzbget/nzbget-client';
-import { NzbgetQueueItem, NzbgetStatus } from '../usenet/nzbget/types';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
+import { NzbgetQueueItem, NzbgetStatus } from '../../../../server/api/routers/usenet/nzbget/types';
 import { ConfigAppType, IntegrationField } from '../../../../types/app';
 import { getConfig } from '../../../../tools/config/getConfig';
 import { UsenetQueueItem } from '../../../../widgets/useNet/types';
diff --git a/src/pages/api/modules/usenet/history.ts b/src/pages/api/modules/usenet/history.ts
index 88976e383..f75e3bdb6 100644
--- a/src/pages/api/modules/usenet/history.ts
+++ b/src/pages/api/modules/usenet/history.ts
@@ -3,8 +3,8 @@ import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { Client } from 'sabnzbd-api';
-import { NzbgetHistoryItem } from './nzbget/types';
-import { NzbgetClient } from './nzbget/nzbget-client';
+import { NzbgetHistoryItem } from '../../../../server/api/routers/usenet/nzbget/types';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
 import { getConfig } from '../../../../tools/config/getConfig';
 import { UsenetHistoryItem } from '../../../../widgets/useNet/types';
 
diff --git a/src/pages/api/modules/usenet/index.ts b/src/pages/api/modules/usenet/index.ts
index dc041de1d..bf539c38f 100644
--- a/src/pages/api/modules/usenet/index.ts
+++ b/src/pages/api/modules/usenet/index.ts
@@ -4,8 +4,8 @@ import duration from 'dayjs/plugin/duration';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/config/getConfig';
-import { NzbgetClient } from './nzbget/nzbget-client';
-import { NzbgetStatus } from './nzbget/types';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
+import { NzbgetStatus } from '../../../../server/api/routers/usenet/nzbget/types';
 
 dayjs.extend(duration);
 
diff --git a/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts b/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts
deleted file mode 100644
index 9c77b63dc..000000000
--- a/src/pages/api/modules/usenet/nzbget/nzbget-api.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'nzbget-api';
diff --git a/src/pages/api/modules/usenet/nzbget/nzbget-client.ts b/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
deleted file mode 100644
index ef614dd57..000000000
--- a/src/pages/api/modules/usenet/nzbget/nzbget-client.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import NZBGet from 'nzbget-api';
-import { NzbgetClientOptions } from './types';
-
-export function NzbgetClient(options: NzbgetClientOptions) {
-  if (!options?.host) {
-    throw new Error('Cannot connect to NZBGet. Missing host in app config.');
-  }
-
-  if (!options?.port) {
-    throw new Error('Cannot connect to NZBGet. Missing port in app config.');
-  }
-
-  if (!options?.login) {
-    throw new Error('Cannot connect to NZBGet. Missing username in app config.');
-  }
-
-  if (!options?.hash) {
-    throw new Error('Cannot connect to NZBGet. Missing password in app config.');
-  }
-
-  return new NZBGet(options);
-}
diff --git a/src/pages/api/modules/usenet/nzbget/types.ts b/src/pages/api/modules/usenet/nzbget/types.ts
deleted file mode 100644
index e51f5861a..000000000
--- a/src/pages/api/modules/usenet/nzbget/types.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-export interface NzbgetHistoryItem {
-  NZBID: number;
-  Kind: 'NZB' | 'URL' | 'DUP';
-  NZBFilename: string;
-  Name: string;
-  URL: string;
-  HistoryTime: number;
-  DestDir: string;
-  FinalDir: string;
-  Category: string;
-  FileSizeLo: number;
-  FileSizeHi: number;
-  FileSizeMB: number;
-  FileCount: number;
-  RemainingFileCount: number;
-  MinPostTime: number;
-  MaxPostTime: number;
-  TotalArticles: number;
-  SuccessArticles: number;
-  FailedArticles: number;
-  Health: number;
-  DownloadedSizeLo: number;
-  DownloadedSizeHi: number;
-  DownloadedSizeMB: number;
-  DownloadTimeSec: number;
-  PostTotalTimeSec: number;
-  ParTimeSec: number;
-  RepairTimeSec: number;
-  UnpackTimeSec: number;
-  MessageCount: number;
-  DupeKey: string;
-  DupeScore: number;
-  DupeMode: 'SCORE' | 'ALL' | 'FORCE';
-  Status: string;
-  ParStatus: 'NONE' | 'FAILURE' | 'REPAIR_POSSIBLE' | 'SUCCESS' | 'MANUAL';
-  ExParStatus: 'RECIPIENT' | 'DONOR';
-  UnpackStatus: 'NONE' | 'FAILURE' | 'SPACE' | 'PASSWORD' | 'SUCCESS';
-  UrlStatus: 'NONE' | 'SUCCESS' | 'FAILURE' | 'SCAN_SKIPPED' | 'SCAN_FAILURE';
-  ScriptStatus: 'NONE' | 'FAILURE' | 'SUCCESS';
-  ScriptStatuses: [];
-  MoveStatus: 'NONE' | 'SUCCESS' | 'FAILURE';
-  DeleteStatus: 'NONE' | 'MANUAL' | 'HEALTH' | 'DUPE' | 'BAD' | 'SCAN' | 'COPY';
-  MarkStatus: 'NONE' | 'GOOD' | 'BAD';
-  ExtraParBlocks: number;
-  Parameters: [];
-  ServerStats: [];
-}
-
-export interface NzbgetQueueItem {
-  NZBID: number;
-  NZBFilename: string;
-  NZBName: string;
-  Kind: 'NZB' | 'URL';
-  URL: string;
-  DestDir: string;
-  FinalDir: string;
-  Category: string;
-  FileSizeLo: number;
-  FileSizeHi: number;
-  FileSizeMB: number;
-  RemainingSizeLo: number;
-  RemainingSizeHi: number;
-  RemainingSizeMB: number;
-  PausedSizeLo: number;
-  PausedSizeHi: number;
-  PausedSizeMB: number;
-  FileCount: number;
-  RemainingFileCount: number;
-  RemainingParCount: number;
-  MinPostTime: number;
-  MaxPostTime: number;
-  MaxPriority: number;
-  ActiveDownloads: number;
-  Status:
-    | 'QUEUED'
-    | 'PAUSED'
-    | 'DOWNLOADING'
-    | 'FETCHING'
-    | 'PP_QUEUED'
-    | 'LOADING_PARS'
-    | 'VERIFYING_SOURCES'
-    | 'REPAIRING'
-    | 'VERIFYING_REPAIRED'
-    | 'RENAMING'
-    | 'UNPACKING'
-    | 'MOVING'
-    | 'EXECUTING_SCRIPT'
-    | 'PP_FINISHED';
-  TotalArticles: number;
-  SuccessArticles: number;
-  FailedArticles: number;
-  Health: number;
-  CriticalHealth: number;
-  DownloadedSizeLo: number;
-  DownloadedSizeHi: number;
-  DownloadedSizeMB: number;
-  DownloadTimeSec: number;
-  MessageCount: number;
-  DupeKey: string;
-  DupeScore: number;
-  DupeMode: string;
-  Parameters: [];
-  ServerStats: [];
-  PostInfoText: string;
-  PostStageProgress: number;
-  PostTotalTimeSec: number;
-  PostStageTimeSec: number;
-}
-
-export interface NzbgetStatus {
-  RemainingSizeLo: number;
-  RemainingSizeHi: number;
-  RemainingSizeMB: number;
-  ForcedSizeLo: number;
-  ForcedSizeHi: number;
-  ForcedSizeMB: number;
-  DownloadedSizeLo: number;
-  DownloadedSizeHi: number;
-  DownloadedSizeMB: number;
-  ArticleCacheLo: number;
-  ArticleCacheHi: number;
-  ArticleCacheMB: number;
-  DownloadRate: number;
-  AverageDownloadRate: number;
-  DownloadLimit: number;
-  ThreadCount: number;
-  PostJobCount: number;
-  UrlCount: number;
-  UpTimeSec: number;
-  DownloadTimeSec: number;
-  ServerStandBy: boolean;
-  DownloadPaused: boolean;
-  PostPaused: boolean;
-  ScanPaused: boolean;
-  ServerTime: number;
-  ResumeTime: number;
-  FeedActive: boolean;
-  FreeDiskSpaceLo: number;
-  FreeDiskSpaceHi: number;
-  FreeDiskSpaceMB: number;
-  NewsServers: [];
-}
-
-export interface NzbgetClientOptions {
-  host: string;
-  port: string;
-  login: string | undefined;
-  hash: string | undefined;
-}
diff --git a/src/pages/api/modules/usenet/pause.ts b/src/pages/api/modules/usenet/pause.ts
index f3fa5fd8d..4faef1ba3 100644
--- a/src/pages/api/modules/usenet/pause.ts
+++ b/src/pages/api/modules/usenet/pause.ts
@@ -4,7 +4,7 @@ import duration from 'dayjs/plugin/duration';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/config/getConfig';
-import { NzbgetClient } from './nzbget/nzbget-client';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
 
 dayjs.extend(duration);
 
diff --git a/src/pages/api/modules/usenet/queue.ts b/src/pages/api/modules/usenet/queue.ts
index 5aeb5caf9..1dc3d84e8 100644
--- a/src/pages/api/modules/usenet/queue.ts
+++ b/src/pages/api/modules/usenet/queue.ts
@@ -5,8 +5,8 @@ import { NextApiRequest, NextApiResponse } from 'next';
 import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/config/getConfig';
 import { UsenetQueueItem } from '../../../../widgets/useNet/types';
-import { NzbgetClient } from './nzbget/nzbget-client';
-import { NzbgetQueueItem, NzbgetStatus } from './nzbget/types';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
+import { NzbgetQueueItem, NzbgetStatus } from '../../../../server/api/routers/usenet/nzbget/types';
 
 dayjs.extend(duration);
 
diff --git a/src/pages/api/modules/usenet/resume.ts b/src/pages/api/modules/usenet/resume.ts
index 1e1c18ec4..17afa9fe7 100644
--- a/src/pages/api/modules/usenet/resume.ts
+++ b/src/pages/api/modules/usenet/resume.ts
@@ -4,7 +4,7 @@ import duration from 'dayjs/plugin/duration';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { Client } from 'sabnzbd-api';
 import { getConfig } from '../../../../tools/config/getConfig';
-import { NzbgetClient } from './nzbget/nzbget-client';
+import { NzbgetClient } from '../../../../server/api/routers/usenet/nzbget/nzbget-client';
 
 dayjs.extend(duration);