Reorganize bootstrap