Rearrange make file and do some cleanup.