Moved simulation model from simulation to core bundle