Change directory sturcture of this module
Fix oauth2 import in demo.py