move bootstrap git submodule to v3.0.0 ref, fix include errors, rebuild

This moves the bootstrap git submodule to the v3.0.0 ref. So when ```make build```ing the correct bootstrap gets pulled. Adjust for a change in directory structure. Includes the rebuild with the correct bootstrap.