Moved Calculator classes to an Internal sub-namespace