Moved libraries from 'contrib' dir to 'lib' dir for consistency with new practices and build tools.