Started refactoring.
Refactored features and step definitions.
Merge pull request #2 from malchmih/refactor

Refactor