refactor Tools dir for C++11
refactor Tools dir for C++11