Reorganize routing