Updated makefile to match new dirs