Moved CalcUtils to another package