reorganize oauth plugin