Moved and changed makefile for greater visibility.