Move simulator specific method to simulator class. Update layout of run script.