more oauth fixes, some file structure changes