Change layout in toplevel Makefile to improve readability