refactor scenario classes to scenario package