reorganizing project and included homework chap 6 and 7 without bootstrap