Updated some file imports and moved MailBox to its own module.