Complete the unification of the builder modules. All references
are fixed and the new structure is complete.