Move expression.exports to proper place
Merge pull request #387 from elemoine/expressionexports

Move expression.exports to proper place