Update gitconfig
Reorganize files