Move StepUtil to Core Package