Reorder Makefile