reorgs and adds bootstrap