Renamed lib directory, fixed paths