diff --git a/src/main/java/com/uci/outbound/consumers/OutboundKafkaController.java b/src/main/java/com/uci/outbound/consumers/OutboundKafkaController.java
index 143718d..9f024fc 100644
--- a/src/main/java/com/uci/outbound/consumers/OutboundKafkaController.java
+++ b/src/main/java/com/uci/outbound/consumers/OutboundKafkaController.java
@@ -5,9 +5,9 @@
 import com.uci.dao.models.XMessageDAO;
 import com.uci.dao.repository.XMessageRepository;
 import com.uci.dao.utils.XMessageDAOUtils;
-import com.uci.outbound.entity.EmailDetails;
-import com.uci.outbound.service.EmailServiceImpl;
 import com.uci.utils.cache.service.RedisCacheService;
+import com.uci.utils.model.EmailDetails;
+import com.uci.utils.service.EmailServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import messagerosa.core.model.XMessage;
diff --git a/src/main/java/com/uci/outbound/entity/EmailDetails.java b/src/main/java/com/uci/outbound/entity/EmailDetails.java
deleted file mode 100644
index df3e401..0000000
--- a/src/main/java/com/uci/outbound/entity/EmailDetails.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.uci.outbound.entity;
-
-import lombok.*;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
-@Builder
-public class EmailDetails {
-    private String recipient;
-    private String msgBody;
-    private String subject;
-    private String attachment;
-    private String attachmentFileName;
-}
\ No newline at end of file
diff --git a/src/main/java/com/uci/outbound/service/EmailService.java b/src/main/java/com/uci/outbound/service/EmailService.java
deleted file mode 100644
index b228a19..0000000
--- a/src/main/java/com/uci/outbound/service/EmailService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.uci.outbound.service;
-
-import com.uci.outbound.entity.EmailDetails;
-
-public interface EmailService {
-    public void sendSimpleMail(EmailDetails details);
-
-    public void sendMailWithAttachment(EmailDetails details);
-}
diff --git a/src/main/java/com/uci/outbound/service/EmailServiceImpl.java b/src/main/java/com/uci/outbound/service/EmailServiceImpl.java
deleted file mode 100644
index 4a8e566..0000000
--- a/src/main/java/com/uci/outbound/service/EmailServiceImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.uci.outbound.service;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import javax.mail.internet.MimeMessage;
-
-import com.uci.outbound.entity.EmailDetails;
-import lombok.extern.slf4j.Slf4j;
-import messagerosa.core.model.XMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class EmailServiceImpl implements EmailService {
-    @Autowired
-    private JavaMailSender javaMailSender;
-
-    @Value("${spring.mail.username}")
-    private String sender;
-
-    public void sendSimpleMail(EmailDetails details) {
-        try {
-            SimpleMailMessage mailMessage = new SimpleMailMessage();
-            mailMessage.setFrom(sender);
-            mailMessage.setTo(details.getRecipient());
-            mailMessage.setText(details.getMsgBody());
-            mailMessage.setSubject(details.getSubject());
-            javaMailSender.send(mailMessage);
-            log.info("Mail Sent Successfully...");
-        } catch (Exception e) {
-            log.error("Error while Sending Mail" + e.getMessage());
-        }
-    }
-
-    public void sendMailWithAttachment(EmailDetails details) {
-        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-        MimeMessageHelper mimeMessageHelper;
-        String tempPath = "/tmp/" + details.getAttachmentFileName();
-        File file = new File(tempPath);
-        try {
-            mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
-            mimeMessageHelper.setFrom(sender);
-            if (details.getRecipient().contains(",")) {
-                String recipients[] = details.getRecipient().split(",");
-                mimeMessageHelper.setTo(recipients);
-            } else {
-                mimeMessageHelper.setTo(details.getRecipient());
-            }
-            mimeMessageHelper.setText(details.getMsgBody());
-            mimeMessageHelper.setSubject(details.getSubject());
-            createTempFile(details.getAttachment(), tempPath);
-            FileSystemResource fileSystemResource = new FileSystemResource(file);
-            mimeMessageHelper.addAttachment(fileSystemResource.getFilename(), file);
-            javaMailSender.send(mimeMessage);
-            log.info("Mail sent Successfully...");
-        } catch (Exception e) {
-            log.error("Error while sending mail!!! " + e.getMessage());
-        } finally {
-            if (file.exists() && file.delete()) {
-                log.info("file deleted : " + file.getPath());
-            }
-        }
-    }
-
-//    public void sendMailWithAttachment(String subject, String body, String recipient, XMessage xMessage, String attachmentFileName) {
-//        EmailDetails emailDetails = new EmailDetails();
-//        emailDetails.setSubject(subject);
-//        emailDetails.setMsgBody(body);
-//        emailDetails.setRecipient(recipient);
-//        emailDetails.setAttachment(xMessage.toString());
-//        emailDetails.setAttachmentFileName(attachmentFileName);
-//        log.info("EmailDetails :" + emailDetails);
-//        sendMailWithAttachment(emailDetails);
-//    }
-
-    private void createTempFile(String fileData, String filePath) throws IOException {
-        Path path = Paths.get(filePath);
-        Files.writeString(path, fileData, StandardCharsets.UTF_8);
-        log.info("Email attachment temp file is created : " + filePath);
-    }
-}