Reorganize app endpoints