cleanup folders
cleanup folders
Merge pull request #203 from adicu/cleanup

Cleanup