re-organised .gitignore