Moved Calculator (CalculationService) to the separate project