Moving scenarios to separate directory structure