Makefile: re-arrange lib/