Introduce new scenarios directories to allow easy switching

Signed-off-by: J Richard Snape <rsnape@dmu.ac.uk>