Updating the Makefile so it's better organized.