Move Oauth token generation to a new class