Calculator categories

Calculators are now organised in their main category, without duplicate listings.