Delete some
Add less lib
Merge branch 'master' into gh-pages
Move lib directory