Fixed makefile.am to use new source files