rename, restructure .gitignore