Refactored the namespace of mail service.