Moved, made minor improvements to Makefile.