Refactoring base and sub email classes
Updated to exclude personal account info