folder cleanup
Merge pull request #5 from bczulauf/ben-structure

folder cleanup