reorganize order for router