Update .gitconfig
Reorganize pkg tools