Replace single Client class with separate HTTP and OAuth classes