diff --git a/packages/api/src/tasks/__tests__/checkAlerts.test.ts b/packages/api/src/tasks/checkAlerts/__tests__/checkAlerts.test.ts
similarity index 99%
rename from packages/api/src/tasks/__tests__/checkAlerts.test.ts
rename to packages/api/src/tasks/checkAlerts/__tests__/checkAlerts.test.ts
index ce211de42..be443ea4f 100644
--- a/packages/api/src/tasks/__tests__/checkAlerts.test.ts
+++ b/packages/api/src/tasks/checkAlerts/__tests__/checkAlerts.test.ts
@@ -27,7 +27,11 @@ import {
   getPreviousAlertHistories,
   processAlert,
 } from '@/tasks/checkAlerts';
-import { AlertDetails, AlertTaskType, loadProvider } from '@/tasks/providers';
+import {
+  AlertDetails,
+  AlertTaskType,
+  loadProvider,
+} from '@/tasks/checkAlerts/providers';
 import {
   AlertMessageTemplateDefaultView,
   buildAlertMessageTemplateHdxLink,
@@ -35,7 +39,7 @@ import {
   getDefaultExternalAction,
   renderAlertTemplate,
   translateExternalActionsToInternal,
-} from '@/tasks/template';
+} from '@/tasks/checkAlerts/template';
 import * as slack from '@/utils/slack';
 
 // Create provider instance for tests
diff --git a/packages/api/src/tasks/__tests__/checkAlertsTask.test.ts b/packages/api/src/tasks/checkAlerts/__tests__/checkAlertsTask.test.ts
similarity index 97%
rename from packages/api/src/tasks/__tests__/checkAlertsTask.test.ts
rename to packages/api/src/tasks/checkAlerts/__tests__/checkAlertsTask.test.ts
index 903fdd526..f55d0672d 100644
--- a/packages/api/src/tasks/__tests__/checkAlertsTask.test.ts
+++ b/packages/api/src/tasks/checkAlerts/__tests__/checkAlertsTask.test.ts
@@ -6,20 +6,19 @@ import { ObjectId } from '@/models';
 import { AlertSource, AlertThresholdType, IAlert } from '@/models/alert';
 import { ISource } from '@/models/source';
 import { IWebhook } from '@/models/webhook';
-import CheckAlertTask from '@/tasks/checkAlerts';
 import * as checkAlerts from '@/tasks/checkAlerts';
+import CheckAlertTask from '@/tasks/checkAlerts';
 import {
   AlertDetails,
   AlertProvider,
   AlertTaskType,
   loadProvider,
-} from '@/tasks/providers';
-
-import { CheckAlertsTaskArgs } from '../types';
+} from '@/tasks/checkAlerts/providers';
+import { CheckAlertsTaskArgs } from '@/tasks/types';
 
-jest.mock('@/tasks/providers', () => {
+jest.mock('@/tasks/checkAlerts/providers', () => {
   return {
-    ...jest.requireActual('@/tasks/providers'),
+    ...jest.requireActual('@/tasks/checkAlerts/providers'),
     loadProvider: jest.fn(),
   };
 });
diff --git a/packages/api/src/tasks/__tests__/singleInvocationAlert.test.ts b/packages/api/src/tasks/checkAlerts/__tests__/singleInvocationAlert.test.ts
similarity index 99%
rename from packages/api/src/tasks/__tests__/singleInvocationAlert.test.ts
rename to packages/api/src/tasks/checkAlerts/__tests__/singleInvocationAlert.test.ts
index 4a6f17c77..97ba3f2f9 100644
--- a/packages/api/src/tasks/__tests__/singleInvocationAlert.test.ts
+++ b/packages/api/src/tasks/checkAlerts/__tests__/singleInvocationAlert.test.ts
@@ -15,7 +15,11 @@ import { SavedSearch } from '@/models/savedSearch';
 import { Source } from '@/models/source';
 import Webhook from '@/models/webhook';
 import { processAlert } from '@/tasks/checkAlerts';
-import { AlertDetails, AlertTaskType, loadProvider } from '@/tasks/providers';
+import {
+  AlertDetails,
+  AlertTaskType,
+  loadProvider,
+} from '@/tasks/checkAlerts/providers';
 import * as slack from '@/utils/slack';
 
 describe('Single Invocation Alert Test', () => {
diff --git a/packages/api/src/tasks/checkAlerts.ts b/packages/api/src/tasks/checkAlerts/index.ts
similarity index 99%
rename from packages/api/src/tasks/checkAlerts.ts
rename to packages/api/src/tasks/checkAlerts/index.ts
index b93ce7b66..69e704e86 100644
--- a/packages/api/src/tasks/checkAlerts.ts
+++ b/packages/api/src/tasks/checkAlerts/index.ts
@@ -28,13 +28,14 @@ import {
   AlertTask,
   AlertTaskType,
   loadProvider,
-} from '@/tasks/providers';
+} from '@/tasks/checkAlerts/providers';
 import {
   AlertMessageTemplateDefaultView,
   buildAlertMessageTemplateTitle,
   handleSendGenericWebhook,
   renderAlertTemplate,
-} from '@/tasks/template';
+} from '@/tasks/checkAlerts/template';
+import { tasksTracer } from '@/tasks/tracer';
 import { CheckAlertsTaskArgs, HdxTask } from '@/tasks/types';
 import {
   calcAlertDateRange,
@@ -43,8 +44,6 @@ import {
 } from '@/tasks/util';
 import logger from '@/utils/logger';
 
-import { tasksTracer } from './tracer';
-
 export const doesExceedThreshold = (
   thresholdType: AlertThresholdType,
   threshold: number,
diff --git a/packages/api/src/tasks/providers/__tests__/default.test.ts b/packages/api/src/tasks/checkAlerts/providers/__tests__/default.test.ts
similarity index 99%
rename from packages/api/src/tasks/providers/__tests__/default.test.ts
rename to packages/api/src/tasks/checkAlerts/providers/__tests__/default.test.ts
index 30b3f1dcd..cecc95a00 100644
--- a/packages/api/src/tasks/providers/__tests__/default.test.ts
+++ b/packages/api/src/tasks/checkAlerts/providers/__tests__/default.test.ts
@@ -12,7 +12,7 @@ import {
   AlertProvider,
   AlertTaskType,
   loadProvider,
-} from '@/tasks/providers/index';
+} from '@/tasks/checkAlerts/providers';
 
 const MOCK_SAVED_SEARCH: any = {
   id: 'fake-saved-search-id',
diff --git a/packages/api/src/tasks/providers/default.ts b/packages/api/src/tasks/checkAlerts/providers/default.ts
similarity index 98%
rename from packages/api/src/tasks/providers/default.ts
rename to packages/api/src/tasks/checkAlerts/providers/default.ts
index 0d6833b1b..0b443ff88 100644
--- a/packages/api/src/tasks/providers/default.ts
+++ b/packages/api/src/tasks/checkAlerts/providers/default.ts
@@ -19,15 +19,12 @@ import {
   type AlertProvider,
   type AlertTask,
   AlertTaskType,
-} from '@/tasks/providers';
+} from '@/tasks/checkAlerts/providers';
+import { MappedOmit } from '@/tasks/types';
 import { convertMsToGranularityString } from '@/utils/common';
 import logger from '@/utils/logger';
 
-import {
-  AggregatedAlertHistory,
-  getPreviousAlertHistories,
-} from '../checkAlerts';
-import { MappedOmit } from '../types';
+import { AggregatedAlertHistory, getPreviousAlertHistories } from '..';
 
 type PartialAlertDetails = MappedOmit<AlertDetails, 'previous'>;
 
diff --git a/packages/api/src/tasks/providers/index.ts b/packages/api/src/tasks/checkAlerts/providers/index.ts
similarity index 95%
rename from packages/api/src/tasks/providers/index.ts
rename to packages/api/src/tasks/checkAlerts/providers/index.ts
index 3553c4a95..d1653e1e5 100644
--- a/packages/api/src/tasks/providers/index.ts
+++ b/packages/api/src/tasks/checkAlerts/providers/index.ts
@@ -10,11 +10,10 @@ import { IDashboard } from '@/models/dashboard';
 import { ISavedSearch } from '@/models/savedSearch';
 import { ISource } from '@/models/source';
 import { IWebhook } from '@/models/webhook';
-import DefaultAlertProvider from '@/tasks/providers/default';
+import DefaultAlertProvider from '@/tasks/checkAlerts/providers/default';
 import logger from '@/utils/logger';
 
-import { AggregatedAlertHistory } from '../checkAlerts';
-import { CheckAlertsTaskArgs } from '../types';
+import { AggregatedAlertHistory } from '..';
 
 export enum AlertTaskType {
   SAVED_SEARCH,
diff --git a/packages/api/src/tasks/template.ts b/packages/api/src/tasks/checkAlerts/template.ts
similarity index 99%
rename from packages/api/src/tasks/template.ts
rename to packages/api/src/tasks/checkAlerts/template.ts
index c57876be4..6cda57be5 100644
--- a/packages/api/src/tasks/template.ts
+++ b/packages/api/src/tasks/checkAlerts/template.ts
@@ -24,7 +24,10 @@ import { ISavedSearch } from '@/models/savedSearch';
 import { ISource } from '@/models/source';
 import { IWebhook } from '@/models/webhook';
 import { doesExceedThreshold } from '@/tasks/checkAlerts';
-import { AlertProvider, PopulatedAlertChannel } from '@/tasks/providers';
+import {
+  AlertProvider,
+  PopulatedAlertChannel,
+} from '@/tasks/checkAlerts/providers';
 import { escapeJsonString, unflattenObject } from '@/tasks/util';
 import { truncateString } from '@/utils/common';
 import logger from '@/utils/logger';