Refactor scenario data

In order to simplify the data mappings, I aded the
all_in_one mapping data to the common file and
will assume that each scenario can provide it's differences
in its own data mapping file. I also updated the 2_role
scenario to do this.