Edited Makefile to work with new directory layout, fixed --uninstall option