Updated Scenario Builder

order imports according to pep8 and hacking