Provider: DrupalOAuth2: Reorganized the code.