Revert "reorganize order for router"

This reverts commit 8fe62e96f075bcbb261b5bbce12ad727772ab10d.