Moved regression feature as scenario in new structure

Helps with #408.