fixing some of the include errors and the naming of bootstrap to bootstrap1 according to the dirname.