Combined ExpressionBuilder into ExpressionParser and created expression tree package