Restructering OAuth2 stuff ...