Organized the Makefile a bit more.