Moved rerun to new structure
Merge two features for the rerun formatter.

Closes #464
Merge branch 'pr/464'