Fix #652 Save scenario tool still uses extra directory level.