More refactoring
Add .gitignore