Move calculators to main.cc Also some clean-up.