Separated out the keypoint conversion and freeing routine. Renamed a file.