re-organize dirs for multiple runs