removed AggregationFunctions removed deprecated methods from MathFunctions moved SQLTemplates subclasses into own files refactored SQLTemplates into JavaBean compliant form