WIP refactor email service

Signed-off-by: Madhura Bhave <mbhave@gopivotal.com>