Refactor run config

Introduce some new required parameters, reorganize existing parameters