Fixed: NPE in Factories
Modified: Refactored Operators and Calculators into API. Restricted visibility of Operators and Calculators to package