Updating instructions
Updating makefile to new directories