Updated filenames and makefile. Working now.