Moved Expression classes before Statements
And/Or fixes