gitignore
start refactoring