Minor restructuring of the Makefile