Moved Email components into a module