Moved Point class inside Router class