Add bootstrap as submodule
Improve refacto
Improve refacto with less