Issue #38: Put e-mail related files into a separate package