Api.OAuth project and some cleanup