modified Makefile to reflect file structure changes