gitignore tweak
Refactoring/renaming