Add bootstrap and renaming some files