Removed the Server class. Minor modifications to the Imap and Mail classes