Changed structure of features to make it more consistent and to make em work with cucumber reports