merged step definition files together
refactored step definitions