Reorganize REST API