A little reorganization. Also attempting to use OAuth2 Python library.