Moving createDemandSet and create DemandProfile to ScenarioFactory