move Router to Core