[Refactor] Change Router to TargetSelector

Router will be introduce independantly.