organizing oauth pieces