Reorganize 'bootstrap'