[bld] Simplifying build structure.