Moved router to controller