Refactor Auth classes
Remove old files