Make lib/ better