Update batch building/loading code.

Merge data and convdata modules.