Reorganize and add Mandrill support
Cleanup