Refactored to use the OAuthConstants
Refactored packages and duplicates