Reorganized the routes