cleaned up contributors steps
shuffled the location of some step defs