Rearranging the Makefile - how about now?