Rearrange make file to fit our layout.