added email and refactored/renamed UserModel (and deleted old User class)