Rearrange make file