fixes #4; moves OAuth2 into a pckaged object