Changed folder structure
Removed old bootstrap submodule