Reshuffled OAuthServer classes