Initial work on refactoring Auth\Auth