reorganise routes