Moved skipstep1 templates