Restructured Directory and Mailbox collection

Work towards allowing reuse of mailboxes