Moved rerun to new structure