Refactor cucumber step_definitions

Refactor step_definitions to be related to domain concepts rather than directly tied to features