Refactoring and gitignore modification