Add internal bootstrap at a different path and change bootstrap to optional