Update makefile for new files and moved data