Oauth2 cleaned a bit and renamed from Manager to Oauth2