Moving Point to shared directory.  Renaming methods, adding extra getter logic