Name wrapping method as Scenario
Solution restructure

Solution resturctured to make navigation a little easier.
Grouped system gherkin concerns seperately.
Removed tests which were effectively duplicates.