Moved router to container