Final refactoring to Calculator + kernels