restructure and rename buildExpr

Addresses #231
Yep, it is.