Issue 6: Better tree organization; add Yaron's ...
fix silly bug
Update .gitignore