Rearrange makefile