[cleanup] Reorganized .gitignore