Refactor to move OAuth2Settings and AuthorizationHeader to oauth2 package