Reorg of some of the bootstrap section.