Reorg Makefile rules