Refactoring and .gitignore