Start of lots of renames
Lots of renames and refactors into separate files
Refactor auth client

Bring out duplicated code into helper methods and to make this class
much cleaner and simpler for futher enhancement