[change] Router separated