Rearrange run_iter code
Update test + evaluation module to use new data structures