Change Makefile ordering