Jira MAR-1592 Added Sendgrid MailService and restructure Directories