refactored PDP scenario, now uses generic models
added models to scenario generator
comment