Rearrange Makefile so just running 'make' works