Moved router to core