untrack gen & bin + refactored and adjusted the models
Merge pull request #9 from tendlich/master

untrack gen & bin + refactored and adjusted the models