Change ordering for Makefile