Merge pull request #140 from dmcdougall/sep_impl_simmodel

Add separated implementation of SimulationModel
Add separated implementation for SimulationStorage