a lot of changes
scenarios are no in a separate folder