Some Makefile organization improvements