Use New Builder Infrastructure

**Note:** *in-progress* pull-request.