Clean up and reorg started on runs.scm