Adjust Makefile for new file locations