Remove lib
Fix paths