Modified makefile to reflect structure changes