Class renaming
Reshaping RangeFinder classes