Yup. More refactoring :D
Fix gitignore