Moved and updated Makefile