Modified makefile to fit with new folder schema.