Organized and cleaned up Makefile