griffin re-org and c++11 changes