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

Lib folders updated