Reorganize build a bit.