--refactor simulation and configuration objects together.