Move Step2 to its own directory