Lib folders updated
Merge pull request #46 from mauroa/master

Lib folders updated