Calculators and main

Jaret Wrintmorerequested to merge
Calculators into master

To unify the naming used for classes

Edited by Jaret Wrintmore

Merge request reports