toplevel Makefile subdirs rearranged