Consolidated the Makefiles in lib; modified the main README accordingly