Remove the scenario package

Move the code from there to the top-level package