A bit of reorg and adding in bootstrap files.