Reorder api urls, and name all of them