Moved Point to separate file