Updated files to match the library name, improved Makefile wrapper