Updates to email code to decouple
Breaking change - renaming files to reflect new code
New mail file & email