Bunch of restructuring to simplify building businesses. Moved
a bunch of the building functions into the modules.