Folder re-org to add C++ tools