Reshaping RangeFinder classes