2.5.1

Renamed lib/ -> src/
Fixed #670
Fixed #584