Change folder name lib to src
Merge origin/master