Renamed all the authtoken stuff
Introduced new Account class.

Refactored the code base to use the new account class.
Now to get everything to compile.