package refactor
gitignore update