Rearrange Makefile