Expression Language Refactoring
Fixed mod operation
ExpressionLanguage now part of TemplateFactory object
ExpressionLanguage now part of TemplateFactory object