Added Categories, 

structured for oauth2 reusable functions