Fixed bootstrap file structure and dependencies