updated makefile to use seperate packages and install correctly.