Added MailMate stuff; re-organized a bit
Reorganizing after having added MailMate stuff