Try less magic.
Add .gitignore
Rename files