- removed unnecessary duplicate
- some refactoring and cleaning up GIT
- updated .gitignore