Reorganizing bootstrap stuff