Moved the libraries to a folder
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Revert to independant lib folder