Reorganize routes