#7 SMTP moved to its own package