Moved the Mailer into its own package.