Organize step_definitions and remove old files