Remove lib and test-lib folders from project.
Merge remote-tracking branch 'origin/master'