split out the extract and move steps, and fix 'creates' statements