Fix git conf for recent updates and update bootstrap to new folder structure.