Renamed lib directory libs; other cleanup