rm currency conversions and fix class naming