changed file structure and updated bootstrap