fixing the path issue
restructuring (unfinished)
problems with imports
working state
cust auth introduced
Merge branch 'oauth2' into oauth