refactoring

I moved all the Expression static methods (add, or devide.. etc)
into Expressions.

And rolling back the Evaluation Expression and renamed if to
When.
implemented when expression