Restructuring the Makefile slightly