rearrange modules, add Ringup; converters for CSV iterator; change Calculator logic