Move step definitions into a more modular location