Changed Methods -> CalcMethods class

More sensible names for classes