Re-organize the Remakefile.