Simplified SimulationRunner
Added some UML diagrams