cleaning up the bootstrap and adding the submodule