Several updates

1. Update the protoPick method in C-support for the return type issue
2. Update couple templates
3. Keep the DirDiff mapping in the DirDiff
Add DoxygenToolkit