Cleanup/organize makefile.