Refactored toplevel Makefile