Rework scenario crate
Rename
Upgrade code