gitignore reorganized