Client creation refactoring

Client may authenticate now using a provided token.

Change-Id: Ia2843dea115dc87623b1e6330a7254a3cada68c4