Modified makefile hierarchy.