added gitk settings
reorganize