Simplify class names, add CalculatorRegistry and forms for configs