Moved Email to separate library