Refactored the Auth classes.
Refactored Cache classes.
Initial work on moving services out of contrib/