Rearrange mdrun/runner.h