Refactoring, added .gitignore