Make package loadable
Remove cruft from Makefile