restructure and rename buildExpr

Addresses #231
Also needs an update here