Removed submodule libpackageinfo, updated Makefile