Added bootstrap and changed filenames