diff --git a/packages/api/src/@core/utils/types/original/original.crm.ts b/packages/api/src/@core/utils/types/original/original.crm.ts
index 5b4fe47b7..edac1494d 100644
--- a/packages/api/src/@core/utils/types/original/original.crm.ts
+++ b/packages/api/src/@core/utils/types/original/original.crm.ts
@@ -1,69 +1,53 @@
+import { FreshsalesCompanyOutput } from '@crm/company/services/freshsales/types';
+import { HubspotCompanyOutput } from '@crm/company/services/hubspot/types';
+import { PipedriveCompanyOutput } from '@crm/company/services/pipedrive/types';
+import { ZendeskCompanyOutput } from '@crm/company/services/zendesk/types';
+import { ZohoCompanyOutput } from '@crm/company/services/zoho/types';
 import {
   FreshsalesContactInput,
-  HubspotContactInput,
-  PipedriveContactInput,
-  ZendeskContactInput,
-  ZohoContactInput,
   FreshsalesContactOutput,
+} from '@crm/contact/services/freshsales/types';
+import {
+  HubspotContactInput,
   HubspotContactOutput,
+} from '@crm/contact/services/hubspot/types';
+import {
+  PipedriveContactInput,
   PipedriveContactOutput,
-  ZendeskContactOutput,
+} from '@crm/contact/services/pipedrive/types';
+import {
+  ZohoContactInput,
   ZohoContactOutput,
-  FreshsalesCompanyOutput,
-  HubspotCompanyOutput,
-  PipedriveCompanyOutput,
-  ZendeskCompanyOutput,
-  ZohoCompanyOutput,
+} from '@crm/contact/services/zoho/types';
+import { FreshsalesDealOutput } from '@crm/deal/services/freshsales/types';
+import { HubspotDealOutput } from '@crm/deal/services/hubspot/types';
+import { PipedriveDealOutput } from '@crm/deal/services/pipedrive/types';
+import { ZendeskDealOutput } from '@crm/deal/services/zendesk/types';
+import { ZohoDealOutput } from '@crm/deal/services/zoho/types';
+import {
   FreshsalesEngagementInput,
   FreshsalesEngagementOutput,
-  FreshsalesNoteInput,
-  FreshsalesNoteOutput,
-  FreshsalesStageInput,
-  FreshsalesStageOutput,
-  FreshsalesTaskInput,
-  FreshsalesTaskOutput,
-  HubspotDealOutput,
+} from '@crm/engagement/services/freshsales/types';
+import {
   HubspotEngagementInput,
   HubspotEngagementOutput,
-  HubspotStageInput,
-  HubspotStageOutput,
-  HubspotTaskInput,
-  HubspotTaskOutput,
+} from '@crm/engagement/services/hubspot/types';
+import {
   PipedriveEngagementInput,
   PipedriveEngagementOutput,
-  PipedriveStageInput,
-  PipedriveStageOutput,
-  PipedriveTaskInput,
-  PipedriveTaskOutput,
+} from '@crm/engagement/services/pipedrive/types';
+import {
   ZendeskEngagementInput,
   ZendeskEngagementOutput,
-  ZendeskStageInput,
-  ZendeskStageOutput,
-  ZendeskTaskInput,
-  ZendeskTaskOutput,
+} from '@crm/engagement/services/zendesk/types';
+import {
   ZohoEngagementInput,
   ZohoEngagementOutput,
-  ZohoNoteInput,
-  ZohoNoteOutput,
-  ZohoStageInput,
-  ZohoStageOutput,
-  ZohoTaskInput,
-  ZohoTaskOutput,
-  FreshsalesUserOutput,
-  HubspotUserOutput,
-  PipedriveUserOutput,
-  ZendeskUserOutput,
-  ZohoUserOutput,
-  FreshsalesUserInput,
-  HubspotUserInput,
-  PipedriveUserInput,
-  ZendeskUserInput,
-  ZohoUserInput,
-} from '@crm/@utils/@types';
-import { FreshsalesDealOutput } from '@crm/deal/services/freshsales/types';
-import { PipedriveDealOutput } from '@crm/deal/services/pipedrive/types';
-import { ZendeskDealOutput } from '@crm/deal/services/zendesk/types';
-import { ZohoDealOutput } from '@crm/deal/services/zoho/types';
+} from '@crm/engagement/services/zoho/types';
+import {
+  FreshsalesNoteInput,
+  FreshsalesNoteOutput,
+} from '@crm/note/services/freshsales/types';
 import {
   HubspotNoteInput,
   HubspotNoteOutput,
@@ -76,6 +60,65 @@ import {
   ZendeskNoteInput,
   ZendeskNoteOutput,
 } from '@crm/note/services/zendesk/types';
+import { ZohoNoteInput, ZohoNoteOutput } from '@crm/note/services/zoho/types';
+import {
+  FreshsalesStageInput,
+  FreshsalesStageOutput,
+} from '@crm/stage/services/freshsales/types';
+import {
+  HubspotStageInput,
+  HubspotStageOutput,
+} from '@crm/stage/services/hubspot/types';
+import {
+  PipedriveStageInput,
+  PipedriveStageOutput,
+} from '@crm/stage/services/pipedrive/types';
+import {
+  ZendeskStageInput,
+  ZendeskStageOutput,
+} from '@crm/stage/services/zendesk/types';
+import {
+  ZohoStageInput,
+  ZohoStageOutput,
+} from '@crm/stage/services/zoho/types';
+import {
+  FreshsalesTaskInput,
+  FreshsalesTaskOutput,
+} from '@crm/task/services/freshsales/types';
+import {
+  HubspotTaskInput,
+  HubspotTaskOutput,
+} from '@crm/task/services/hubspot/types';
+import {
+  PipedriveTaskInput,
+  PipedriveTaskOutput,
+} from '@crm/task/services/pipedrive/types';
+import {
+  ZendeskTaskInput,
+  ZendeskTaskOutput,
+} from '@crm/task/services/zendesk/types';
+import { ZohoTaskInput, ZohoTaskOutput } from '@crm/task/services/zoho/types';
+import {
+  FreshsalesUserInput,
+  FreshsalesUserOutput,
+} from '@crm/user/services/freshsales/types';
+import {
+  HubspotUserInput,
+  HubspotUserOutput,
+} from '@crm/user/services/hubspot/types';
+import {
+  PipedriveUserInput,
+  PipedriveUserOutput,
+} from '@crm/user/services/pipedrive/types';
+import { ZohoUserInput, ZohoUserOutput } from '@crm/user/services/zoho/types';
+import {
+  ZendeskContactInput,
+  ZendeskContactOutput,
+} from '@ticketing/contact/services/zendesk/types';
+import {
+  ZendeskUserInput,
+  ZendeskUserOutput,
+} from '@ticketing/user/services/zendesk/types';
 
 /* INPUT */
 
diff --git a/packages/api/src/crm/company/services/freshsales/index.ts b/packages/api/src/crm/company/services/freshsales/index.ts
index c9ee4fa79..883ebaa55 100644
--- a/packages/api/src/crm/company/services/freshsales/index.ts
+++ b/packages/api/src/crm/company/services/freshsales/index.ts
@@ -1,11 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesCompanyInput,
-  FreshsalesCompanyOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
@@ -13,6 +9,7 @@ import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ICompanyService } from '@crm/company/types';
 import { ServiceRegistry } from '../registry.service';
+import { FreshsalesCompanyInput, FreshsalesCompanyOutput } from './types';
 
 @Injectable()
 export class FreshsalesService implements ICompanyService {
diff --git a/packages/api/src/crm/company/services/freshsales/mappers.ts b/packages/api/src/crm/company/services/freshsales/mappers.ts
index 3af094ef8..94ea2cf13 100644
--- a/packages/api/src/crm/company/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/company/services/freshsales/mappers.ts
@@ -3,10 +3,7 @@ import {
   UnifiedCompanyInput,
   UnifiedCompanyOutput,
 } from '@crm/company/types/model.unified';
-import {
-  FreshsalesCompanyInput,
-  FreshsalesCompanyOutput,
-} from '@crm/@utils/@types';
+import { FreshsalesCompanyInput, FreshsalesCompanyOutput } from './types';
 
 //TODO
 export class FreshsalesCompanyMapper implements ICompanyMapper {
diff --git a/packages/api/src/crm/company/services/hubspot/index.ts b/packages/api/src/crm/company/services/hubspot/index.ts
index 8ebba0c0b..6a2648e25 100644
--- a/packages/api/src/crm/company/services/hubspot/index.ts
+++ b/packages/api/src/crm/company/services/hubspot/index.ts
@@ -1,11 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ICompanyService } from '@crm/company/types';
-import {
-  CrmObject,
-  HubspotCompanyInput,
-  HubspotCompanyOutput,
-  commonCompanyHubspotProperties,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -13,6 +8,11 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import {
+  commonCompanyHubspotProperties,
+  HubspotCompanyInput,
+  HubspotCompanyOutput,
+} from './types';
 
 @Injectable()
 export class HubspotService implements ICompanyService {
diff --git a/packages/api/src/crm/company/services/hubspot/mappers.ts b/packages/api/src/crm/company/services/hubspot/mappers.ts
index c420929cb..97f57649b 100644
--- a/packages/api/src/crm/company/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/company/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotCompanyInput, HubspotCompanyOutput } from '@crm/@utils/@types';
+import { HubspotCompanyInput, HubspotCompanyOutput } from './types';
 import {
   UnifiedCompanyInput,
   UnifiedCompanyOutput,
diff --git a/packages/api/src/crm/company/services/pipedrive/index.ts b/packages/api/src/crm/company/services/pipedrive/index.ts
index ae4b62b3e..200514db0 100644
--- a/packages/api/src/crm/company/services/pipedrive/index.ts
+++ b/packages/api/src/crm/company/services/pipedrive/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ICompanyService } from '@crm/company/types';
-import {
-  CrmObject,
-  PipedriveCompanyInput,
-  PipedriveCompanyOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { PipedriveCompanyInput, PipedriveCompanyOutput } from './types';
 
 @Injectable()
 export class PipedriveService implements ICompanyService {
diff --git a/packages/api/src/crm/company/services/pipedrive/mappers.ts b/packages/api/src/crm/company/services/pipedrive/mappers.ts
index 6280ef259..7f7b2f696 100644
--- a/packages/api/src/crm/company/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/company/services/pipedrive/mappers.ts
@@ -1,14 +1,10 @@
-import {
-  PipedriveCompanyInput,
-  PipedriveCompanyOutput,
-} from '@crm/@utils/@types';
 import {
   UnifiedCompanyInput,
   UnifiedCompanyOutput,
 } from '@crm/company/types/model.unified';
 import { ICompanyMapper } from '@crm/company/types';
 import { Utils } from '@crm/contact/utils';
-import { OriginalCompanyOutput } from '@@core/utils/types/original/original.crm';
+import { PipedriveCompanyInput, PipedriveCompanyOutput } from './types';
 
 export class PipedriveCompanyMapper implements ICompanyMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/company/services/zendesk/index.ts b/packages/api/src/crm/company/services/zendesk/index.ts
index 34c307cd5..a70a93b0b 100644
--- a/packages/api/src/crm/company/services/zendesk/index.ts
+++ b/packages/api/src/crm/company/services/zendesk/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ICompanyService } from '@crm/company/types';
-import {
-  CrmObject,
-  ZendeskCompanyInput,
-  ZendeskCompanyOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { ZendeskCompanyInput, ZendeskCompanyOutput } from './types';
 @Injectable()
 export class ZendeskService implements ICompanyService {
   constructor(
diff --git a/packages/api/src/crm/company/services/zendesk/mappers.ts b/packages/api/src/crm/company/services/zendesk/mappers.ts
index 8c79cf148..8fe9771e1 100644
--- a/packages/api/src/crm/company/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/company/services/zendesk/mappers.ts
@@ -1,14 +1,11 @@
-import {
-  Address,
-  ZendeskCompanyInput,
-  ZendeskCompanyOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
 import {
   UnifiedCompanyInput,
   UnifiedCompanyOutput,
 } from '@crm/company/types/model.unified';
 import { ICompanyMapper } from '@crm/company/types';
 import { Utils } from '@crm/contact/utils';
+import { ZendeskCompanyInput, ZendeskCompanyOutput } from './types';
 
 export class ZendeskCompanyMapper implements ICompanyMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/company/services/zoho/index.ts b/packages/api/src/crm/company/services/zoho/index.ts
index d51c879d4..4faa6e73f 100644
--- a/packages/api/src/crm/company/services/zoho/index.ts
+++ b/packages/api/src/crm/company/services/zoho/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ICompanyService } from '@crm/company/types';
-import {
-  CrmObject,
-  ZohoCompanyInput,
-  ZohoCompanyOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { ZohoCompanyInput, ZohoCompanyOutput } from './types';
 
 @Injectable()
 export class ZohoService implements ICompanyService {
diff --git a/packages/api/src/crm/company/services/zoho/mappers.ts b/packages/api/src/crm/company/services/zoho/mappers.ts
index f1e8ffdaa..3aaae294d 100644
--- a/packages/api/src/crm/company/services/zoho/mappers.ts
+++ b/packages/api/src/crm/company/services/zoho/mappers.ts
@@ -1,9 +1,9 @@
-import { ZohoCompanyInput, ZohoCompanyOutput } from '@crm/@utils/@types';
 import {
   UnifiedCompanyInput,
   UnifiedCompanyOutput,
 } from '@crm/company/types/model.unified';
 import { ICompanyMapper } from '@crm/company/types';
+import { ZohoCompanyInput, ZohoCompanyOutput } from './types';
 
 export class ZohoCompanyMapper implements ICompanyMapper {
   desunify(
diff --git a/packages/api/src/crm/contact/services/attio/index.ts b/packages/api/src/crm/contact/services/attio/index.ts
index 2e9f8ecb1..cbfff2bae 100644
--- a/packages/api/src/crm/contact/services/attio/index.ts
+++ b/packages/api/src/crm/contact/services/attio/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IContactService } from '@crm/contact/types';
-import {
-  CrmObject,
-  AttioContactInput,
-  AttioContactOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { AttioContactInput, AttioContactOutput } from './types';
 
 @Injectable()
 export class AttioService implements IContactService {
diff --git a/packages/api/src/crm/contact/services/attio/mappers.ts b/packages/api/src/crm/contact/services/attio/mappers.ts
index 7ece91954..49a6ef3e5 100644
--- a/packages/api/src/crm/contact/services/attio/mappers.ts
+++ b/packages/api/src/crm/contact/services/attio/mappers.ts
@@ -1,14 +1,11 @@
-import {
-  Address,
-  AttioContactInput,
-  AttioContactOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
 import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
 import { IContactMapper } from '@crm/contact/types';
 import { Utils } from '@crm/contact/utils';
+import { AttioContactInput, AttioContactOutput } from './types';
 
 export class AttioContactMapper implements IContactMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/contact/services/freshsales/index.ts b/packages/api/src/crm/contact/services/freshsales/index.ts
index f1d5e3d31..a08a89a7f 100644
--- a/packages/api/src/crm/contact/services/freshsales/index.ts
+++ b/packages/api/src/crm/contact/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesContactInput,
-  FreshsalesContactOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesContactInput, FreshsalesContactOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/contact/services/freshsales/mappers.ts b/packages/api/src/crm/contact/services/freshsales/mappers.ts
index 3943fbcf6..3c0ab4fda 100644
--- a/packages/api/src/crm/contact/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/contact/services/freshsales/mappers.ts
@@ -3,11 +3,8 @@ import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
-import {
-  Address,
-  FreshsalesContactInput,
-  FreshsalesContactOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
+import { FreshsalesContactInput, FreshsalesContactOutput } from './types';
 
 //TODO
 export class FreshsalesContactMapper implements IContactMapper {
diff --git a/packages/api/src/crm/contact/services/hubspot/index.ts b/packages/api/src/crm/contact/services/hubspot/index.ts
index cf8c7c082..a0bc2e1c1 100644
--- a/packages/api/src/crm/contact/services/hubspot/index.ts
+++ b/packages/api/src/crm/contact/services/hubspot/index.ts
@@ -1,11 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IContactService } from '@crm/contact/types';
-import {
-  CrmObject,
-  HubspotContactInput,
-  HubspotContactOutput,
-  commonHubspotProperties,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -13,6 +8,11 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import {
+  commonHubspotProperties,
+  HubspotContactInput,
+  HubspotContactOutput,
+} from './types';
 
 @Injectable()
 export class HubspotService implements IContactService {
diff --git a/packages/api/src/crm/contact/services/hubspot/mappers.ts b/packages/api/src/crm/contact/services/hubspot/mappers.ts
index df1e583e7..ecad3aa8d 100644
--- a/packages/api/src/crm/contact/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/contact/services/hubspot/mappers.ts
@@ -1,14 +1,10 @@
-import {
-  Address,
-  HubspotContactInput,
-  HubspotContactOutput,
-} from '@crm/@utils/@types';
 import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
 import { IContactMapper } from '@crm/contact/types';
 import { Utils } from '@crm/contact/utils';
+import { HubspotContactInput, HubspotContactOutput } from './types';
 
 export class HubspotContactMapper implements IContactMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/contact/services/pipedrive/index.ts b/packages/api/src/crm/contact/services/pipedrive/index.ts
index 66a666ef7..a00513ec9 100644
--- a/packages/api/src/crm/contact/services/pipedrive/index.ts
+++ b/packages/api/src/crm/contact/services/pipedrive/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IContactService } from '@crm/contact/types';
-import {
-  CrmObject,
-  PipedriveContactInput,
-  PipedriveContactOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { PipedriveContactInput, PipedriveContactOutput } from './types';
 
 @Injectable()
 export class PipedriveService implements IContactService {
diff --git a/packages/api/src/crm/contact/services/pipedrive/mappers.ts b/packages/api/src/crm/contact/services/pipedrive/mappers.ts
index 5e3f91dcd..b2aa258dc 100644
--- a/packages/api/src/crm/contact/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/contact/services/pipedrive/mappers.ts
@@ -1,14 +1,11 @@
-import {
-  Address,
-  PipedriveContactInput,
-  PipedriveContactOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
 import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
 import { IContactMapper } from '@crm/contact/types';
 import { Utils } from '@crm/contact/utils';
+import { PipedriveContactInput, PipedriveContactOutput } from './types';
 
 export class PipedriveContactMapper implements IContactMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/contact/services/zendesk/index.ts b/packages/api/src/crm/contact/services/zendesk/index.ts
index 272922f7f..bb24d2232 100644
--- a/packages/api/src/crm/contact/services/zendesk/index.ts
+++ b/packages/api/src/crm/contact/services/zendesk/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IContactService } from '@crm/contact/types';
-import {
-  CrmObject,
-  ZendeskContactInput,
-  ZendeskContactOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { ZendeskContactInput, ZendeskContactOutput } from './types';
 @Injectable()
 export class ZendeskService implements IContactService {
   constructor(
diff --git a/packages/api/src/crm/contact/services/zendesk/mappers.ts b/packages/api/src/crm/contact/services/zendesk/mappers.ts
index eca9cf966..880c20ae6 100644
--- a/packages/api/src/crm/contact/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/contact/services/zendesk/mappers.ts
@@ -1,14 +1,11 @@
-import {
-  Address,
-  ZendeskContactInput,
-  ZendeskContactOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
 import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
 import { IContactMapper } from '@crm/contact/types';
 import { Utils } from '@crm/contact/utils';
+import { ZendeskContactInput, ZendeskContactOutput } from './types';
 
 export class ZendeskContactMapper implements IContactMapper {
   private readonly utils: Utils;
diff --git a/packages/api/src/crm/contact/services/zoho/index.ts b/packages/api/src/crm/contact/services/zoho/index.ts
index f795ee00f..703700f99 100644
--- a/packages/api/src/crm/contact/services/zoho/index.ts
+++ b/packages/api/src/crm/contact/services/zoho/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IContactService } from '@crm/contact/types';
-import {
-  CrmObject,
-  ZohoContactInput,
-  ZohoContactOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
@@ -12,6 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
+import { ZohoContactInput, ZohoContactOutput } from './types';
 
 @Injectable()
 export class ZohoService implements IContactService {
diff --git a/packages/api/src/crm/contact/services/zoho/mappers.ts b/packages/api/src/crm/contact/services/zoho/mappers.ts
index d97bb053f..58238f717 100644
--- a/packages/api/src/crm/contact/services/zoho/mappers.ts
+++ b/packages/api/src/crm/contact/services/zoho/mappers.ts
@@ -1,13 +1,10 @@
-import {
-  Address,
-  ZohoContactInput,
-  ZohoContactOutput,
-} from '@crm/@utils/@types';
+import { Address } from '@crm/@utils/@types';
 import {
   UnifiedContactInput,
   UnifiedContactOutput,
 } from '@crm/contact/types/model.unified';
 import { IContactMapper } from '@crm/contact/types';
+import { ZohoContactInput, ZohoContactOutput } from './types';
 
 export class ZohoContactMapper implements IContactMapper {
   desunify(
diff --git a/packages/api/src/crm/deal/services/freshsales/index.ts b/packages/api/src/crm/deal/services/freshsales/index.ts
index 3f946dc43..f9bacc110 100644
--- a/packages/api/src/crm/deal/services/freshsales/index.ts
+++ b/packages/api/src/crm/deal/services/freshsales/index.ts
@@ -1,11 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesDealInput,
-  FreshsalesDealOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
@@ -13,7 +9,7 @@ import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { IDealService } from '@crm/deal/types';
 import { ServiceRegistry } from '../registry.service';
-
+import { FreshsalesDealInput, FreshsalesDealOutput } from './types';
 @Injectable()
 export class FreshsalesService implements IDealService {
   constructor(
diff --git a/packages/api/src/crm/deal/services/freshsales/mappers.ts b/packages/api/src/crm/deal/services/freshsales/mappers.ts
index ab947e5ca..c8629a711 100644
--- a/packages/api/src/crm/deal/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/deal/services/freshsales/mappers.ts
@@ -3,7 +3,7 @@ import {
   UnifiedDealInput,
   UnifiedDealOutput,
 } from '@crm/deal/types/model.unified';
-import { FreshsalesDealInput, FreshsalesDealOutput } from '@crm/@utils/@types';
+import { FreshsalesDealInput, FreshsalesDealOutput } from './types';
 
 //TODO
 export class FreshsalesDealMapper implements IDealMapper {
diff --git a/packages/api/src/crm/deal/services/hubspot/index.ts b/packages/api/src/crm/deal/services/hubspot/index.ts
index 94ee9c6c0..5a14d331d 100644
--- a/packages/api/src/crm/deal/services/hubspot/index.ts
+++ b/packages/api/src/crm/deal/services/hubspot/index.ts
@@ -1,11 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IDealService } from '@crm/deal/types';
-import {
-  CrmObject,
-  HubspotDealInput,
-  HubspotDealOutput,
-  commonDealHubspotProperties,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -13,7 +8,11 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
-
+import {
+  HubspotDealInput,
+  HubspotDealOutput,
+  commonDealHubspotProperties,
+} from './types';
 @Injectable()
 export class HubspotService implements IDealService {
   constructor(
diff --git a/packages/api/src/crm/deal/services/hubspot/mappers.ts b/packages/api/src/crm/deal/services/hubspot/mappers.ts
index 33df083dd..37314e905 100644
--- a/packages/api/src/crm/deal/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/deal/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotDealInput, HubspotDealOutput } from '@crm/@utils/@types';
+import { HubspotDealInput, HubspotDealOutput } from './types';
 import {
   UnifiedDealInput,
   UnifiedDealOutput,
diff --git a/packages/api/src/crm/deal/services/pipedrive/index.ts b/packages/api/src/crm/deal/services/pipedrive/index.ts
index 754b96a3d..030c47987 100644
--- a/packages/api/src/crm/deal/services/pipedrive/index.ts
+++ b/packages/api/src/crm/deal/services/pipedrive/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IDealService } from '@crm/deal/types';
-import {
-  CrmObject,
-  PipedriveDealInput,
-  PipedriveDealOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { PipedriveDealInput, PipedriveDealOutput } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/deal/services/pipedrive/mappers.ts b/packages/api/src/crm/deal/services/pipedrive/mappers.ts
index 1a91794f6..7095712df 100644
--- a/packages/api/src/crm/deal/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/deal/services/pipedrive/mappers.ts
@@ -1,4 +1,4 @@
-import { PipedriveDealInput, PipedriveDealOutput } from '@crm/@utils/@types';
+import { PipedriveDealInput, PipedriveDealOutput } from './types';
 import {
   UnifiedDealInput,
   UnifiedDealOutput,
diff --git a/packages/api/src/crm/deal/services/zendesk/index.ts b/packages/api/src/crm/deal/services/zendesk/index.ts
index efcc5bbc2..3eeb5245f 100644
--- a/packages/api/src/crm/deal/services/zendesk/index.ts
+++ b/packages/api/src/crm/deal/services/zendesk/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IDealService } from '@crm/deal/types';
-import {
-  CrmObject,
-  ZendeskDealInput,
-  ZendeskDealOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskDealInput, ZendeskDealOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/deal/services/zendesk/mappers.ts b/packages/api/src/crm/deal/services/zendesk/mappers.ts
index 5e98b3552..69584b6b7 100644
--- a/packages/api/src/crm/deal/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/deal/services/zendesk/mappers.ts
@@ -1,4 +1,4 @@
-import { ZendeskDealInput, ZendeskDealOutput } from '@crm/@utils/@types';
+import { ZendeskDealInput, ZendeskDealOutput } from './types';
 import {
   UnifiedDealInput,
   UnifiedDealOutput,
diff --git a/packages/api/src/crm/deal/services/zoho/index.ts b/packages/api/src/crm/deal/services/zoho/index.ts
index 892d4d825..5ce3dee9b 100644
--- a/packages/api/src/crm/deal/services/zoho/index.ts
+++ b/packages/api/src/crm/deal/services/zoho/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IDealService } from '@crm/deal/types';
-import { CrmObject, ZohoDealInput, ZohoDealOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
@@ -8,7 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
-
+import { ZohoDealInput, ZohoDealOutput } from './types';
 @Injectable()
 export class ZohoService implements IDealService {
   constructor(
diff --git a/packages/api/src/crm/deal/services/zoho/mappers.ts b/packages/api/src/crm/deal/services/zoho/mappers.ts
index 230cc09da..9b1841d65 100644
--- a/packages/api/src/crm/deal/services/zoho/mappers.ts
+++ b/packages/api/src/crm/deal/services/zoho/mappers.ts
@@ -1,4 +1,4 @@
-import { ZohoDealInput, ZohoDealOutput } from '@crm/@utils/@types';
+import { ZohoDealInput, ZohoDealOutput } from './types';
 import {
   UnifiedDealInput,
   UnifiedDealOutput,
diff --git a/packages/api/src/crm/engagement/services/freshsales/index.ts b/packages/api/src/crm/engagement/services/freshsales/index.ts
index ab59b93b0..f130b4126 100644
--- a/packages/api/src/crm/engagement/services/freshsales/index.ts
+++ b/packages/api/src/crm/engagement/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesEngagementInput,
-  FreshsalesEngagementOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesEngagementInput, FreshsalesEngagementOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/engagement/services/freshsales/mappers.ts b/packages/api/src/crm/engagement/services/freshsales/mappers.ts
index 8fb74834a..bce3aa3ca 100644
--- a/packages/api/src/crm/engagement/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/engagement/services/freshsales/mappers.ts
@@ -3,10 +3,7 @@ import {
   UnifiedEngagementInput,
   UnifiedEngagementOutput,
 } from '@crm/engagement/types/model.unified';
-import {
-  FreshsalesEngagementInput,
-  FreshsalesEngagementOutput,
-} from '@crm/@utils/@types';
+import { FreshsalesEngagementInput, FreshsalesEngagementOutput } from './types';
 
 //TODO
 export class FreshsalesEngagementMapper implements IEngagementMapper {
diff --git a/packages/api/src/crm/engagement/services/hubspot/index.ts b/packages/api/src/crm/engagement/services/hubspot/index.ts
index 9204af1e1..e5efc2ade 100644
--- a/packages/api/src/crm/engagement/services/hubspot/index.ts
+++ b/packages/api/src/crm/engagement/services/hubspot/index.ts
@@ -1,7 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { IEngagementService } from '@crm/engagement/types';
+import { CrmObject } from '@crm/@utils/@types';
+import axios from 'axios';
+import { PrismaService } from '@@core/prisma/prisma.service';
+import { LoggerService } from '@@core/logger/logger.service';
+import { ActionType, handleServiceError } from '@@core/utils/errors';
+import { EncryptionService } from '@@core/encryption/encryption.service';
+import { ApiResponse } from '@@core/utils/types';
+import { ServiceRegistry } from '../registry.service';
 import {
-  CrmObject,
   HubspotEngagementCallInput,
   HubspotEngagementCallOutput,
   HubspotEngagementEmailInput,
@@ -11,16 +18,8 @@ import {
   HubspotEngagementMeetingOutput,
   HubspotEngagementOutput,
   commonCallHubspotProperties,
-  commonHubspotProperties,
   commonMeetingHubspotProperties,
-} from '@crm/@utils/@types';
-import axios from 'axios';
-import { PrismaService } from '@@core/prisma/prisma.service';
-import { LoggerService } from '@@core/logger/logger.service';
-import { ActionType, handleServiceError } from '@@core/utils/errors';
-import { EncryptionService } from '@@core/encryption/encryption.service';
-import { ApiResponse } from '@@core/utils/types';
-import { ServiceRegistry } from '../registry.service';
+} from './types';
 
 @Injectable()
 export class HubspotService implements IEngagementService {
diff --git a/packages/api/src/crm/engagement/services/hubspot/mappers.ts b/packages/api/src/crm/engagement/services/hubspot/mappers.ts
index c3b2ef645..287611bd6 100644
--- a/packages/api/src/crm/engagement/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/engagement/services/hubspot/mappers.ts
@@ -3,11 +3,11 @@ import {
   HubspotEngagementCallOutput,
   HubspotEngagementEmailInput,
   HubspotEngagementEmailOutput,
+  HubspotEngagementInput,
   HubspotEngagementMeetingInput,
   HubspotEngagementMeetingOutput,
-  HubspotEngagementInput,
   HubspotEngagementOutput,
-} from '@crm/@utils/@types';
+} from './types';
 import {
   UnifiedEngagementInput,
   UnifiedEngagementOutput,
diff --git a/packages/api/src/crm/engagement/services/pipedrive/index.ts b/packages/api/src/crm/engagement/services/pipedrive/index.ts
index 86c21b28b..9c98282f6 100644
--- a/packages/api/src/crm/engagement/services/pipedrive/index.ts
+++ b/packages/api/src/crm/engagement/services/pipedrive/index.ts
@@ -1,10 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { IEngagementService } from '@crm/engagement/types';
-import {
-  CrmObject,
-  PipedriveEngagementInput,
-  PipedriveEngagementOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
@@ -12,7 +8,7 @@ import { ActionType, handleServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/encryption/encryption.service';
 import { ApiResponse } from '@@core/utils/types';
 import { ServiceRegistry } from '../registry.service';
-
+import { PipedriveEngagementInput, PipedriveEngagementOutput } from './types';
 @Injectable()
 export class PipedriveService implements IEngagementService {
   constructor(
diff --git a/packages/api/src/crm/engagement/services/pipedrive/mappers.ts b/packages/api/src/crm/engagement/services/pipedrive/mappers.ts
index 98e01f579..6b431bb86 100644
--- a/packages/api/src/crm/engagement/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/engagement/services/pipedrive/mappers.ts
@@ -1,7 +1,4 @@
-import {
-  PipedriveEngagementInput,
-  PipedriveEngagementOutput,
-} from '@crm/@utils/@types';
+import { PipedriveEngagementInput, PipedriveEngagementOutput } from './types';
 import {
   UnifiedEngagementInput,
   UnifiedEngagementOutput,
diff --git a/packages/api/src/crm/engagement/services/zendesk/index.ts b/packages/api/src/crm/engagement/services/zendesk/index.ts
index 50fa949f4..28826f2c2 100644
--- a/packages/api/src/crm/engagement/services/zendesk/index.ts
+++ b/packages/api/src/crm/engagement/services/zendesk/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IEngagementService } from '@crm/engagement/types';
-import {
-  CrmObject,
-  ZendeskEngagementInput,
-  ZendeskEngagementOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskEngagementInput, ZendeskEngagementOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/engagement/services/zendesk/mappers.ts b/packages/api/src/crm/engagement/services/zendesk/mappers.ts
index 7f58ae667..84f4adeb3 100644
--- a/packages/api/src/crm/engagement/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/engagement/services/zendesk/mappers.ts
@@ -1,7 +1,5 @@
-import {
-  ZendeskEngagementInput,
-  ZendeskEngagementOutput,
-} from '@crm/@utils/@types';
+import { ZendeskEngagementInput, ZendeskEngagementOutput } from './types';
+
 import {
   UnifiedEngagementInput,
   UnifiedEngagementOutput,
diff --git a/packages/api/src/crm/engagement/services/zoho/index.ts b/packages/api/src/crm/engagement/services/zoho/index.ts
index 5dd756e15..9bbdc95e8 100644
--- a/packages/api/src/crm/engagement/services/zoho/index.ts
+++ b/packages/api/src/crm/engagement/services/zoho/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IEngagementService } from '@crm/engagement/types';
-import {
-  CrmObject,
-  ZohoEngagementInput,
-  ZohoEngagementOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZohoEngagementInput, ZohoEngagementOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/engagement/services/zoho/mappers.ts b/packages/api/src/crm/engagement/services/zoho/mappers.ts
index 57501f152..19f1e64cf 100644
--- a/packages/api/src/crm/engagement/services/zoho/mappers.ts
+++ b/packages/api/src/crm/engagement/services/zoho/mappers.ts
@@ -1,4 +1,4 @@
-import { ZohoEngagementInput, ZohoEngagementOutput } from '@crm/@utils/@types';
+import { ZohoEngagementInput, ZohoEngagementOutput } from './types';
 import {
   UnifiedEngagementInput,
   UnifiedEngagementOutput,
diff --git a/packages/api/src/crm/note/services/freshsales/index.ts b/packages/api/src/crm/note/services/freshsales/index.ts
index 610c390ab..61b18df11 100644
--- a/packages/api/src/crm/note/services/freshsales/index.ts
+++ b/packages/api/src/crm/note/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesNoteInput,
-  FreshsalesNoteOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesNoteInput, FreshsalesNoteOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/note/services/freshsales/mappers.ts b/packages/api/src/crm/note/services/freshsales/mappers.ts
index 73ec63a4c..3b2fd61bc 100644
--- a/packages/api/src/crm/note/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/note/services/freshsales/mappers.ts
@@ -3,7 +3,7 @@ import {
   UnifiedNoteInput,
   UnifiedNoteOutput,
 } from '@crm/note/types/model.unified';
-import { FreshsalesNoteInput, FreshsalesNoteOutput } from '@crm/@utils/@types';
+import { FreshsalesNoteInput, FreshsalesNoteOutput } from './types';
 
 //TODO
 export class FreshsalesNoteMapper implements INoteMapper {
diff --git a/packages/api/src/crm/note/services/hubspot/index.ts b/packages/api/src/crm/note/services/hubspot/index.ts
index 805811dda..ddcfbc47d 100644
--- a/packages/api/src/crm/note/services/hubspot/index.ts
+++ b/packages/api/src/crm/note/services/hubspot/index.ts
@@ -1,12 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { INoteService } from '@crm/note/types';
+import { CrmObject } from '@crm/@utils/@types';
 import {
-  CrmObject,
   HubspotNoteInput,
   HubspotNoteOutput,
-  commonHubspotProperties,
   commonNoteHubspotProperties,
-} from '@crm/@utils/@types';
+} from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/note/services/hubspot/mappers.ts b/packages/api/src/crm/note/services/hubspot/mappers.ts
index eec061079..fec832225 100644
--- a/packages/api/src/crm/note/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/note/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotNoteInput, HubspotNoteOutput } from '@crm/@utils/@types';
+import { HubspotNoteInput, HubspotNoteOutput } from './types';
 import {
   UnifiedNoteInput,
   UnifiedNoteOutput,
diff --git a/packages/api/src/crm/note/services/pipedrive/index.ts b/packages/api/src/crm/note/services/pipedrive/index.ts
index d35323e00..74d9dc329 100644
--- a/packages/api/src/crm/note/services/pipedrive/index.ts
+++ b/packages/api/src/crm/note/services/pipedrive/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { INoteService } from '@crm/note/types';
-import {
-  CrmObject,
-  PipedriveNoteInput,
-  PipedriveNoteOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { PipedriveNoteInput, PipedriveNoteOutput } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/note/services/pipedrive/mappers.ts b/packages/api/src/crm/note/services/pipedrive/mappers.ts
index 3e406112e..74e2afa2d 100644
--- a/packages/api/src/crm/note/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/note/services/pipedrive/mappers.ts
@@ -1,4 +1,4 @@
-import { PipedriveNoteInput, PipedriveNoteOutput } from '@crm/@utils/@types';
+import { PipedriveNoteInput, PipedriveNoteOutput } from './types';
 import {
   UnifiedNoteInput,
   UnifiedNoteOutput,
diff --git a/packages/api/src/crm/note/services/zendesk/index.ts b/packages/api/src/crm/note/services/zendesk/index.ts
index f09b72d0c..184dcd7ea 100644
--- a/packages/api/src/crm/note/services/zendesk/index.ts
+++ b/packages/api/src/crm/note/services/zendesk/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { INoteService } from '@crm/note/types';
-import {
-  CrmObject,
-  ZendeskNoteInput,
-  ZendeskNoteOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskNoteInput, ZendeskNoteOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/note/services/zendesk/mappers.ts b/packages/api/src/crm/note/services/zendesk/mappers.ts
index f8d92ede2..ee15867a4 100644
--- a/packages/api/src/crm/note/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/note/services/zendesk/mappers.ts
@@ -1,4 +1,4 @@
-import { ZendeskNoteInput, ZendeskNoteOutput } from '@crm/@utils/@types';
+import { ZendeskNoteInput, ZendeskNoteOutput } from './types';
 import {
   UnifiedNoteInput,
   UnifiedNoteOutput,
diff --git a/packages/api/src/crm/note/services/zoho/index.ts b/packages/api/src/crm/note/services/zoho/index.ts
index bda71460c..76acaf74c 100644
--- a/packages/api/src/crm/note/services/zoho/index.ts
+++ b/packages/api/src/crm/note/services/zoho/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { INoteService } from '@crm/note/types';
-import { CrmObject, ZohoNoteInput, ZohoNoteOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZohoNoteInput, ZohoNoteOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/note/services/zoho/mappers.ts b/packages/api/src/crm/note/services/zoho/mappers.ts
index 3e161e266..d33726d7c 100644
--- a/packages/api/src/crm/note/services/zoho/mappers.ts
+++ b/packages/api/src/crm/note/services/zoho/mappers.ts
@@ -1,4 +1,4 @@
-import { ZohoNoteInput, ZohoNoteOutput } from '@crm/@utils/@types';
+import { ZohoNoteInput, ZohoNoteOutput } from './types';
 import {
   UnifiedNoteInput,
   UnifiedNoteOutput,
diff --git a/packages/api/src/crm/stage/services/freshsales/index.ts b/packages/api/src/crm/stage/services/freshsales/index.ts
index 3a764554a..67c3d1998 100644
--- a/packages/api/src/crm/stage/services/freshsales/index.ts
+++ b/packages/api/src/crm/stage/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesStageInput,
-  FreshsalesStageOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesStageInput, FreshsalesStageOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/stage/services/freshsales/mappers.ts b/packages/api/src/crm/stage/services/freshsales/mappers.ts
index de236180a..e57ab399a 100644
--- a/packages/api/src/crm/stage/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/stage/services/freshsales/mappers.ts
@@ -3,10 +3,7 @@ import {
   UnifiedStageInput,
   UnifiedStageOutput,
 } from '@crm/stage/types/model.unified';
-import {
-  FreshsalesStageInput,
-  FreshsalesStageOutput,
-} from '@crm/@utils/@types';
+import { FreshsalesStageInput, FreshsalesStageOutput } from './types';
 
 //TODO
 export class FreshsalesStageMapper implements IStageMapper {
diff --git a/packages/api/src/crm/stage/services/hubspot/index.ts b/packages/api/src/crm/stage/services/hubspot/index.ts
index 3c7e65a4d..e7352bf18 100644
--- a/packages/api/src/crm/stage/services/hubspot/index.ts
+++ b/packages/api/src/crm/stage/services/hubspot/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IStageService } from '@crm/stage/types';
-import {
-  CrmObject,
-  HubspotStageOutput,
-  commonStageHubspotProperties,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { HubspotStageOutput, commonStageHubspotProperties } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/stage/services/hubspot/mappers.ts b/packages/api/src/crm/stage/services/hubspot/mappers.ts
index 1d22bd5a0..e4bddc833 100644
--- a/packages/api/src/crm/stage/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/stage/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotStageInput, HubspotStageOutput } from '@crm/@utils/@types';
+import { HubspotStageOutput, HubspotStageInput } from './types';
 import {
   UnifiedStageInput,
   UnifiedStageOutput,
diff --git a/packages/api/src/crm/stage/services/pipedrive/index.ts b/packages/api/src/crm/stage/services/pipedrive/index.ts
index e0fed2a49..de23ce149 100644
--- a/packages/api/src/crm/stage/services/pipedrive/index.ts
+++ b/packages/api/src/crm/stage/services/pipedrive/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IStageService } from '@crm/stage/types';
-import {
-  CrmObject,
-  PipedriveStageInput,
-  PipedriveStageOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { PipedriveStageOutput } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/stage/services/pipedrive/mappers.ts b/packages/api/src/crm/stage/services/pipedrive/mappers.ts
index 24cbc3f2e..557f73be9 100644
--- a/packages/api/src/crm/stage/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/stage/services/pipedrive/mappers.ts
@@ -1,4 +1,4 @@
-import { PipedriveStageInput, PipedriveStageOutput } from '@crm/@utils/@types';
+import { PipedriveStageInput, PipedriveStageOutput } from './types';
 import {
   UnifiedStageInput,
   UnifiedStageOutput,
diff --git a/packages/api/src/crm/stage/services/zendesk/index.ts b/packages/api/src/crm/stage/services/zendesk/index.ts
index 25b783038..827d024cd 100644
--- a/packages/api/src/crm/stage/services/zendesk/index.ts
+++ b/packages/api/src/crm/stage/services/zendesk/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IStageService } from '@crm/stage/types';
-import { CrmObject, ZendeskStageOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskStageOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/stage/services/zendesk/mappers.ts b/packages/api/src/crm/stage/services/zendesk/mappers.ts
index 4538b5ca2..4363a0242 100644
--- a/packages/api/src/crm/stage/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/stage/services/zendesk/mappers.ts
@@ -1,4 +1,4 @@
-import { ZendeskStageInput, ZendeskStageOutput } from '@crm/@utils/@types';
+import { ZendeskStageOutput, ZendeskStageInput } from './types';
 import {
   UnifiedStageInput,
   UnifiedStageOutput,
diff --git a/packages/api/src/crm/stage/services/zoho/index.ts b/packages/api/src/crm/stage/services/zoho/index.ts
index aaa1f90b5..4028c97a0 100644
--- a/packages/api/src/crm/stage/services/zoho/index.ts
+++ b/packages/api/src/crm/stage/services/zoho/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IStageService } from '@crm/stage/types';
-import { CrmObject, ZohoStageInput, ZohoStageOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZohoStageOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/stage/services/zoho/mappers.ts b/packages/api/src/crm/stage/services/zoho/mappers.ts
index 50aa996c5..eb86c39ba 100644
--- a/packages/api/src/crm/stage/services/zoho/mappers.ts
+++ b/packages/api/src/crm/stage/services/zoho/mappers.ts
@@ -1,4 +1,4 @@
-import { ZohoStageInput, ZohoStageOutput } from '@crm/@utils/@types';
+import { ZohoStageOutput, ZohoStageInput } from './types';
 import {
   UnifiedStageInput,
   UnifiedStageOutput,
diff --git a/packages/api/src/crm/task/services/freshsales/index.ts b/packages/api/src/crm/task/services/freshsales/index.ts
index 5460808f2..e8658c167 100644
--- a/packages/api/src/crm/task/services/freshsales/index.ts
+++ b/packages/api/src/crm/task/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesTaskInput,
-  FreshsalesTaskOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesTaskInput, FreshsalesTaskOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/task/services/freshsales/mappers.ts b/packages/api/src/crm/task/services/freshsales/mappers.ts
index 1d4cdf7e5..f8b0a5f50 100644
--- a/packages/api/src/crm/task/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/task/services/freshsales/mappers.ts
@@ -3,7 +3,7 @@ import {
   UnifiedTaskInput,
   UnifiedTaskOutput,
 } from '@crm/task/types/model.unified';
-import { FreshsalesTaskInput, FreshsalesTaskOutput } from '@crm/@utils/@types';
+import { FreshsalesTaskInput, FreshsalesTaskOutput } from './types';
 
 //TODO
 export class FreshsalesTaskMapper implements ITaskMapper {
diff --git a/packages/api/src/crm/task/services/hubspot/index.ts b/packages/api/src/crm/task/services/hubspot/index.ts
index 4dd4d1a49..1288f9f6a 100644
--- a/packages/api/src/crm/task/services/hubspot/index.ts
+++ b/packages/api/src/crm/task/services/hubspot/index.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { ITaskService } from '@crm/task/types';
+import { CrmObject } from '@crm/@utils/@types';
 import {
-  CrmObject,
   HubspotTaskInput,
   HubspotTaskOutput,
   commonTaskHubspotProperties,
-} from '@crm/@utils/@types';
+} from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/task/services/hubspot/mappers.ts b/packages/api/src/crm/task/services/hubspot/mappers.ts
index cc4729f19..59cdc31fa 100644
--- a/packages/api/src/crm/task/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/task/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotTaskInput, HubspotTaskOutput } from '@crm/@utils/@types';
+import { HubspotTaskInput, HubspotTaskOutput } from './types';
 import {
   UnifiedTaskInput,
   UnifiedTaskOutput,
diff --git a/packages/api/src/crm/task/services/pipedrive/index.ts b/packages/api/src/crm/task/services/pipedrive/index.ts
index c5a6f12c1..864dea5d2 100644
--- a/packages/api/src/crm/task/services/pipedrive/index.ts
+++ b/packages/api/src/crm/task/services/pipedrive/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { ITaskService } from '@crm/task/types';
-import {
-  CrmObject,
-  PipedriveTaskInput,
-  PipedriveTaskOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { PipedriveTaskInput, PipedriveTaskOutput } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/task/services/pipedrive/mappers.ts b/packages/api/src/crm/task/services/pipedrive/mappers.ts
index 1883cc8c0..fe54f7503 100644
--- a/packages/api/src/crm/task/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/task/services/pipedrive/mappers.ts
@@ -1,4 +1,4 @@
-import { PipedriveTaskInput, PipedriveTaskOutput } from '@crm/@utils/@types';
+import { PipedriveTaskInput, PipedriveTaskOutput } from './types';
 import {
   UnifiedTaskInput,
   UnifiedTaskOutput,
diff --git a/packages/api/src/crm/task/services/zendesk/index.ts b/packages/api/src/crm/task/services/zendesk/index.ts
index 8e9163c19..727aea17a 100644
--- a/packages/api/src/crm/task/services/zendesk/index.ts
+++ b/packages/api/src/crm/task/services/zendesk/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { ITaskService } from '@crm/task/types';
-import {
-  CrmObject,
-  ZendeskTaskInput,
-  ZendeskTaskOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskTaskInput, ZendeskTaskOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/task/services/zendesk/mappers.ts b/packages/api/src/crm/task/services/zendesk/mappers.ts
index 6086537b1..cecc520ed 100644
--- a/packages/api/src/crm/task/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/task/services/zendesk/mappers.ts
@@ -1,4 +1,4 @@
-import { ZendeskTaskInput, ZendeskTaskOutput } from '@crm/@utils/@types';
+import { ZendeskTaskInput, ZendeskTaskOutput } from './types';
 import {
   UnifiedTaskInput,
   UnifiedTaskOutput,
diff --git a/packages/api/src/crm/task/services/zoho/index.ts b/packages/api/src/crm/task/services/zoho/index.ts
index eb708f038..fdfd5506e 100644
--- a/packages/api/src/crm/task/services/zoho/index.ts
+++ b/packages/api/src/crm/task/services/zoho/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { ITaskService } from '@crm/task/types';
-import { CrmObject, ZohoTaskInput, ZohoTaskOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZohoTaskInput, ZohoTaskOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/task/services/zoho/mappers.ts b/packages/api/src/crm/task/services/zoho/mappers.ts
index 5a6fe6516..556c0123e 100644
--- a/packages/api/src/crm/task/services/zoho/mappers.ts
+++ b/packages/api/src/crm/task/services/zoho/mappers.ts
@@ -1,4 +1,4 @@
-import { ZohoTaskInput, ZohoTaskOutput } from '@crm/@utils/@types';
+import { ZohoTaskInput, ZohoTaskOutput } from './types';
 import {
   UnifiedTaskInput,
   UnifiedTaskOutput,
diff --git a/packages/api/src/crm/user/services/freshsales/index.ts b/packages/api/src/crm/user/services/freshsales/index.ts
index 3594505b8..2fd9a3b88 100644
--- a/packages/api/src/crm/user/services/freshsales/index.ts
+++ b/packages/api/src/crm/user/services/freshsales/index.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
-import {
-  CrmObject,
-  FreshsalesUserInput,
-  FreshsalesUserOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { FreshsalesUserOutput } from './types';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
 import { ActionType, handleServiceError } from '@@core/utils/errors';
diff --git a/packages/api/src/crm/user/services/freshsales/mappers.ts b/packages/api/src/crm/user/services/freshsales/mappers.ts
index 0af4db7a2..3f4ebf77c 100644
--- a/packages/api/src/crm/user/services/freshsales/mappers.ts
+++ b/packages/api/src/crm/user/services/freshsales/mappers.ts
@@ -3,7 +3,7 @@ import {
   UnifiedUserInput,
   UnifiedUserOutput,
 } from '@crm/user/types/model.unified';
-import { FreshsalesUserInput, FreshsalesUserOutput } from '@crm/@utils/@types';
+import { FreshsalesUserOutput, FreshsalesUserInput } from './types';
 
 //TODO
 export class FreshsalesUserMapper implements IUserMapper {
diff --git a/packages/api/src/crm/user/services/hubspot/index.ts b/packages/api/src/crm/user/services/hubspot/index.ts
index 5b9e1d3dd..4947e2845 100644
--- a/packages/api/src/crm/user/services/hubspot/index.ts
+++ b/packages/api/src/crm/user/services/hubspot/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IUserService } from '@crm/user/types';
-import {
-  CrmObject,
-  HubspotUserOutput,
-  commonUserHubspotProperties,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { HubspotUserOutput, commonUserHubspotProperties } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/user/services/hubspot/mappers.ts b/packages/api/src/crm/user/services/hubspot/mappers.ts
index 975ad80a8..508cd4aa3 100644
--- a/packages/api/src/crm/user/services/hubspot/mappers.ts
+++ b/packages/api/src/crm/user/services/hubspot/mappers.ts
@@ -1,4 +1,4 @@
-import { HubspotUserInput, HubspotUserOutput } from '@crm/@utils/@types';
+import { HubspotUserInput, HubspotUserOutput } from './types';
 import {
   UnifiedUserInput,
   UnifiedUserOutput,
diff --git a/packages/api/src/crm/user/services/pipedrive/index.ts b/packages/api/src/crm/user/services/pipedrive/index.ts
index 0a3769758..c3126ed74 100644
--- a/packages/api/src/crm/user/services/pipedrive/index.ts
+++ b/packages/api/src/crm/user/services/pipedrive/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IUserService } from '@crm/user/types';
-import {
-  CrmObject,
-  PipedriveUserInput,
-  PipedriveUserOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { PipedriveUserOutput } from './types';
 import axios from 'axios';
 import { PrismaService } from '@@core/prisma/prisma.service';
 import { LoggerService } from '@@core/logger/logger.service';
diff --git a/packages/api/src/crm/user/services/pipedrive/mappers.ts b/packages/api/src/crm/user/services/pipedrive/mappers.ts
index 55b892a96..5de472232 100644
--- a/packages/api/src/crm/user/services/pipedrive/mappers.ts
+++ b/packages/api/src/crm/user/services/pipedrive/mappers.ts
@@ -1,4 +1,4 @@
-import { PipedriveUserInput, PipedriveUserOutput } from '@crm/@utils/@types';
+import { PipedriveUserInput, PipedriveUserOutput } from './types';
 import {
   UnifiedUserInput,
   UnifiedUserOutput,
diff --git a/packages/api/src/crm/user/services/zendesk/index.ts b/packages/api/src/crm/user/services/zendesk/index.ts
index b5e2e69a5..004e5bfa6 100644
--- a/packages/api/src/crm/user/services/zendesk/index.ts
+++ b/packages/api/src/crm/user/services/zendesk/index.ts
@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IUserService } from '@crm/user/types';
-import {
-  CrmObject,
-  ZendeskUserInput,
-  ZendeskUserOutput,
-} from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZendeskUserOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/user/services/zendesk/mappers.ts b/packages/api/src/crm/user/services/zendesk/mappers.ts
index d2b625a55..0dbbbde56 100644
--- a/packages/api/src/crm/user/services/zendesk/mappers.ts
+++ b/packages/api/src/crm/user/services/zendesk/mappers.ts
@@ -1,4 +1,4 @@
-import { ZendeskUserInput, ZendeskUserOutput } from '@crm/@utils/@types';
+import { ZendeskUserInput, ZendeskUserOutput } from './types';
 import {
   UnifiedUserInput,
   UnifiedUserOutput,
diff --git a/packages/api/src/crm/user/services/zoho/index.ts b/packages/api/src/crm/user/services/zoho/index.ts
index ce09d030f..5d570699c 100644
--- a/packages/api/src/crm/user/services/zoho/index.ts
+++ b/packages/api/src/crm/user/services/zoho/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { IUserService } from '@crm/user/types';
-import { CrmObject, ZohoUserInput, ZohoUserOutput } from '@crm/@utils/@types';
+import { CrmObject } from '@crm/@utils/@types';
+import { ZohoUserOutput } from './types';
 import axios from 'axios';
 import { LoggerService } from '@@core/logger/logger.service';
 import { PrismaService } from '@@core/prisma/prisma.service';
diff --git a/packages/api/src/crm/user/services/zoho/mappers.ts b/packages/api/src/crm/user/services/zoho/mappers.ts
index c4834ae8a..4b5694605 100644
--- a/packages/api/src/crm/user/services/zoho/mappers.ts
+++ b/packages/api/src/crm/user/services/zoho/mappers.ts
@@ -1,4 +1,5 @@
-import { ZohoUserInput, ZohoUserOutput } from '@crm/@utils/@types';
+import { ZohoUserInput, ZohoUserOutput } from './types';
+
 import {
   UnifiedUserInput,
   UnifiedUserOutput,
diff --git a/packages/api/src/ticketing/collection/types/mappingsTypes.ts b/packages/api/src/ticketing/collection/types/mappingsTypes.ts
index d2c51fba3..edaf45c95 100644
--- a/packages/api/src/ticketing/collection/types/mappingsTypes.ts
+++ b/packages/api/src/ticketing/collection/types/mappingsTypes.ts
@@ -1,16 +1,10 @@
 import { JiraCollectionMapper } from '../services/jira/mappers';
-import { GorgiasCollectionMapper } from '../services/gorgias/mappers';
 
 const jiraCollectionMapper = new JiraCollectionMapper();
-const gorgiasCollectionMapper = new GorgiasCollectionMapper();
 
 export const collectionUnificationMapping = {
   jira: {
     unify: jiraCollectionMapper.unify.bind(jiraCollectionMapper),
     desunify: jiraCollectionMapper.desunify,
   },
-  gorgias: {
-    unify: gorgiasCollectionMapper.unify.bind(gorgiasCollectionMapper),
-    desunify: gorgiasCollectionMapper.desunify,
-  },
 };
diff --git a/packages/api/src/ticketing/team/types/mappingsTypes.ts b/packages/api/src/ticketing/team/types/mappingsTypes.ts
index 8ef99fd0e..8195341db 100644
--- a/packages/api/src/ticketing/team/types/mappingsTypes.ts
+++ b/packages/api/src/ticketing/team/types/mappingsTypes.ts
@@ -1,9 +1,3 @@
-import { ClickupteamMapper } from '../services/clickup/mappers';
-import { FrontteamMapper } from '../services/front/mappers';
-import { GithubteamMapper } from '../services/github/mappers';
-import { GorgiasteamMapper } from '../services/gorgias/mappers';
-import { JirateamMapper } from '../services/jira/mappers';
-import { ClickupTeamMapper } from '../services/clickup/mappers';
 import { JiraTeamMapper } from '../services/jira/mappers';
 import { FrontTeamMapper } from '../services/front/mappers';
 import { GithubTeamMapper } from '../services/github/mappers';
@@ -16,13 +10,6 @@ const githubTeamMapper = new GithubTeamMapper();
 const gorgiasTeamMapper = new GorgiasTeamMapper();
 const jiraTeamMapper = new JiraTeamMapper();
 
-const clickupTeamMapper = new ClickupTeamMapper();
-
-const clickupteamMapper = new ClickupteamMapper();
-const frontteamMapper = new FrontteamMapper();
-const githubteamMapper = new GithubteamMapper();
-const gorgiasteamMapper = new GorgiasteamMapper();
-const jirateamMapper = new JirateamMapper();
 export const teamUnificationMapping = {
   zendesk_tcg: {
     unify: zendeskTeamMapper.unify.bind(zendeskTeamMapper),
@@ -44,8 +31,4 @@ export const teamUnificationMapping = {
     unify: jiraTeamMapper.unify.bind(jiraTeamMapper),
     desunify: jiraTeamMapper.desunify,
   },
-  clickup: {
-    unify: clickupTeamMapper.unify.bind(clickupTeamMapper),
-    desunify: clickupTeamMapper.desunify,
-  },
 };