Refactor, add .gitignore